Nweni f5b6445a21 update

2017-06-04 14:46:00 +06:30

..

accounts_controller.rb

…

cashier_terminals_controller.rb

…

employees_controller.rb

…

lookups_controller.rb

…

membership_settings_controller.rb

…

menu_categories_controller.rb

origin pull master

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

menu_item_attributes_controller.rb

…

menu_item_instances_controller.rb

fixed conflict

2017-06-04 10:23:38 +06:30

menu_item_options_controller.rb

…

menus_controller.rb

origin pull master

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

order_queue_stations_controller.rb

Menu Item instances and OQS json saving

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

payment_method_settings_controller.rb

…

processing_items_controller.rb

…

set_menu_items_controller.rb

fixed conflict

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

simple_menu_items_controller.rb

update

2017-06-04 14:46:00 +06:30

tax_profiles_controller.rb

…

zones_controller.rb

…