merge with master

This commit is contained in:
unknown committed 2012-01-11 20:14:28 +08:00
1 parent 7ebfe3a7f9
commit 9f93af100b
3 files changed
+9 -4

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
require 'carrierwave/orm/mongoid'
#require 'carrierwave/orm/mongoid'
begin
db_config = YAML::load(File.read(File.join(Rails.root, "/config/mongoid.yml")))