merge with master

2012-01-11 20:14:28 +08:00
1 parent 7ebfe3a7f9
commit 9f93af100b
@@ -3,7 +3,8 @@ gem 'rails'
 gem 'yajl-ruby', :require => 'yajl'

 gem 'bson_ext'
-gem 'carrierwave', '0.5.4'
+gem 'carrierwave'
+gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
 gem 'ckeditor'
 gem 'devise'
 gem 'mini_magick'