de739d7d20
Conflicts: vendor/built_in_modules/web_resource/web_resource.json |
||
---|---|---|
.. | ||
_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 |