Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| application.rb | ||
| boot.rb | ||
| config.yml | ||
| database.yml.example | ||
| environment.rb | ||
| ldap.yml | ||
| list.yml | ||
| mongoid.yml | ||
| resque.god | ||
| resque_schedule.god | ||
| resque_schedule.yml | ||
| routes.rb | ||
| solr.god | ||
| sunspot.yml | ||