Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
= Gallery This project rocks and uses MIT-LICENSE.
Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
= Gallery This project rocks and uses MIT-LICENSE.