Nweni 55278c83bc fixed conflict

2017-06-28 12:58:27 +06:30

..

api

billed

2017-06-27 14:02:44 +06:30

concerns

…

crm

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

2017-06-26 17:02:25 +06:30

oqs

not show price 0 fixed

2017-06-27 11:52:51 +06:30

origami

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

2017-06-28 12:45:05 +06:30

reports

update authorize

2017-06-23 09:41:48 +06:30

settings

update authorize

2017-06-23 09:41:48 +06:30

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

update authorize

2017-06-23 09:41:48 +06:30

base_oqs_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

base_origami_controller.rb

first cancan

2017-06-22 15:33:55 +06:30

base_report_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

base_waiter_controller.rb

…

home_controller.rb

fixed conflict

2017-06-28 12:58:27 +06:30

install_controller.rb

…

print_settings_controller.rb

update authorize

2017-06-23 09:41:48 +06:30