phyusin 181701be06 remove conflict

2018-08-07 11:11:03 +06:30

..

api

Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant

2018-08-07 10:44:21 +06:30

concerns

…

crm

Pull from master

2018-08-06 17:52:03 +06:30

inventory

…

oqs

Edit Order item unmatch

2018-07-04 15:22:39 +06:30

origami

Pull from master

2018-08-06 17:52:03 +06:30

reports

Edit in report

2018-08-06 14:44:26 +06:30

settings

Pull from master

2018-08-06 17:52:03 +06:30

transactions

Edit in report

2018-08-06 14:44:26 +06:30

application_controller.rb

add fun:

2018-08-07 10:43:40 +06:30

base_controller.rb

…

base_crm_controller.rb

…

base_inventory_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

…

base_report_controller.rb

…

base_waiter_controller.rb

…

home_controller.rb

Pull from master

2018-08-06 17:52:03 +06:30

install_controller.rb

…

print_settings_controller.rb

…

sym_control_controller.rb

…