Aung Myo 01d217fd0f update conflix split pull

2018-02-28 17:04:35 +06:30

..

api

upsate

2018-02-20 14:15:01 +06:30

concerns

remove conflict data

2018-02-27 14:35:21 +06:30

crm

…

inventory

add shop detail info in inventory

2018-02-23 15:29:22 +06:30

oqs

remove conflict data

2018-02-27 14:35:21 +06:30

origami

update conflix split pull

2018-02-28 17:04:35 +06:30

reports

remove conflict data

2018-02-27 14:35:21 +06:30

settings

…

transactions

…

application_controller.rb

remove conflict data

2018-02-27 14:35:21 +06:30

base_controller.rb

…

base_crm_controller.rb

license and local move to base action and update other base

2018-02-27 11:41:24 +06:30

base_inventory_controller.rb

license and local move to base action and update other base

2018-02-27 11:41:24 +06:30

base_oqs_controller.rb

license and local move to base action and update other base

2018-02-27 11:41:24 +06:30

base_origami_controller.rb

remove conflict data

2018-02-27 14:35:21 +06:30

base_report_controller.rb

remove conflict data

2018-02-27 14:35:21 +06:30

base_waiter_controller.rb

remove conflict data

2018-02-27 14:35:21 +06:30

home_controller.rb

remove conflict data

2018-02-27 14:35:21 +06:30

install_controller.rb

…

print_settings_controller.rb

update token mismatch

2018-02-23 15:49:29 +06:30

sym_control_controller.rb

…