ebc8dd33ec
Conflicts: Gemfile.lock app/controllers/admin/module_apps_controller.rb app/controllers/application_controller.rb vendor/built_in_modules/web_resource/web_resource.json |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
boot.rb | ||
config.yml | ||
database.yml.example | ||
environment.rb | ||
list.yml | ||
mongoid.yml | ||
resque.god | ||
resque_schedule.yml | ||
routes.rb |