Nweni aa295c3a12 fixed conflict

2017-06-04 13:12:02 +06:30

..

_form.html.erb

origin pull master

2017-06-03 13:44:10 +06:30

_settings_menu_item.json.jbuilder

menu items

2017-05-29 15:27:22 +06:30

edit.html.erb

origin pull master

2017-06-03 13:44:10 +06:30

index.html.erb

origin pull master

2017-06-03 13:44:10 +06:30

index.json.jbuilder

menu items

2017-05-29 15:27:22 +06:30

new.html.erb

Menu Item instances and OQS json saving

2017-06-03 17:09:56 +06:30

show.html.erb

fixed conflict

2017-06-04 13:12:02 +06:30

show.json.jbuilder

menu items

2017-05-29 15:27:22 +06:30