Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb |
||
|---|---|---|
| .. | ||
| _drop_down_menu.html.erb | ||
| _lang_menu.html.erb | ||
| _orbit_bar.html.erb | ||
| _side_bar.html.erb | ||
| admin.html.erb | ||
| application.html.erb | ||
| devise.html.erb | ||
| module_widget.html.erb | ||
| new_admin.html.erb | ||
| page_layout.html.erb | ||
| panel.html.erb | ||
| site_editor.html.erb | ||