origin pull master

2017-06-03 13:44:10 +06:30
parent 7529d23147
commit 138850fb24
119 changed files with 2531 additions and 462 deletions
--- a/app/views/settings/menu_item_instances/index.json.jbuilder
+++ b/app/views/settings/menu_item_instances/index.json.jbuilder
@@ -0,0 +1 @@
+json.array! @settings_menu_items, partial: 'settings_menu_items/settings_menu_item', as: :settings_menu_item
				`@@ -0,0 +1 @@`
				`json.array! @settings_menu_items, partial: 'settings_menu_items/settings_menu_item', as: :settings_menu_item`