Aung Myo a5bf5222f6 update conflic file

2017-06-30 14:19:05 +06:30

..

api

merge with origin master

2017-06-30 13:39:52 +06:30

concerns

…

crm

merge with origin master

2017-06-30 13:39:52 +06:30

oqs

update order queue printer

2017-06-29 10:52:12 +06:30

origami

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

2017-06-30 13:44:45 +06:30

reports

update shiftsale

2017-06-30 14:15:04 +06:30

settings

…

transactions

update credit

2017-06-26 19:02:36 +06:30

application_controller.rb

Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant

2017-06-26 21:57:55 +06:30

base_controller.rb

…

base_crm_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

update authorize void and edit in cashier

2017-06-29 15:39:46 +06:30

base_report_controller.rb

…

base_waiter_controller.rb

…

home_controller.rb

shift open/close

2017-06-29 13:35:09 +06:30

install_controller.rb

…

print_settings_controller.rb

update numberformat in pdf

2017-06-28 23:13:20 +06:30