Merge branch 'design_team' into ldap

This commit is contained in:
Christophe Vilayphiou committed 2012-05-17 09:31:02 +08:00
commit bfad553cc3
3 files changed
+59 -4

No files matched your search

+1 -1
View File
@@ -3,7 +3,7 @@ class Asset
include Mongoid::Document
include Mongoid::Timestamps
mount_uploader :data, AssetUploader
mount_uploader :data, FileAssetUploader
field :filename
field :description