Merge branch 'design_team' into ldap
Conflicts: Gemfile app/models/ad_banner.rb
This commit is contained in:
commit
f950f77f36
146 files changed
+14041
-116
No files matched your search
@@ -0,0 +1,6 @@
|
||||
# Use this hook to configure impressionist parameters
|
||||
Impressionist.setup do |config|
|
||||
# Define ORM. Could be :active_record (default) and :mongo_mapper
|
||||
# config.orm = :active_record
|
||||
config.orm = :mongoid
|
||||
end
|
||||
Reference in new issue
Block a user