Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb |
||
|---|---|---|
| .. | ||
| desktop.rb | ||
| desktop_app.rb | ||
| desktop_theme.rb | ||
| desktop_widget.rb | ||
| facebook.rb | ||
| group.rb | ||
| other_account.rb | ||
| section.rb | ||
| tile.rb | ||
| widget_layout.rb | ||
Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb |
||
|---|---|---|
| .. | ||
| desktop.rb | ||
| desktop_app.rb | ||
| desktop_theme.rb | ||
| desktop_widget.rb | ||
| facebook.rb | ||
| group.rb | ||
| other_account.rb | ||
| section.rb | ||
| tile.rb | ||
| widget_layout.rb | ||