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_options/edit.html.erb
+++ b/app/views/settings/menu_item_options/edit.html.erb
@@ -4,7 +4,7 @@
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="<%= settings_menu_items_path %>">Menu Item Options</a></li>
+  			<li><a href="<%= settings_menu_item_options_path %>">Menu Item Options</a></li>
 		  	<li>Edit</li>
 		 </ul>
 		</div>