Aung Myo 8f239cbb0b update conflix for request bill

2018-02-20 13:32:27 +06:30

..

api

conflic data

2018-02-09 10:17:56 +06:30

concerns

…

crm

Shop name in navbar,linke to shop info

2018-02-05 18:11:45 +06:30

inventory

…

oqs

remove conflict data in oqs/home_controller.rb

2018-02-09 10:20:43 +06:30

origami

update conflix for request bill

2018-02-20 13:32:27 +06:30

reports

Shop name in navbar,linke to shop info

2018-02-05 18:11:45 +06:30

settings

…

transactions

…

application_controller.rb

update conflix for request bill

2018-02-20 13:32:27 +06:30

base_controller.rb

…

base_crm_controller.rb

…

base_inventory_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

update pull split bill

2018-02-09 14:31:34 +06:30

base_report_controller.rb

…

base_waiter_controller.rb

…

home_controller.rb

update shop.name

2018-02-09 14:58:08 +06:30

install_controller.rb

add response in license

2018-01-23 14:40:32 +06:30

print_settings_controller.rb

…

sym_control_controller.rb

update license and sym_master

2018-02-13 15:12:09 +06:30