f1c8bed29d
Conflicts: vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
boot.rb | ||
config.yml | ||
database.yml.example | ||
dump.rdb | ||
environment.rb | ||
list.yml | ||
mongoid.yml | ||
resque.god | ||
resque_schedule.yml | ||
routes.rb |