Conflicts: vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/index.html.erb vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/show.html.erb |
||
|---|---|---|
| .. | ||
| panel/gallery | ||
| .gitkeep | ||