Aung Myo eb001275c7 fixed conflict

2017-06-11 18:09:00 +06:30

..

api

fixed conflict

2017-06-11 18:09:00 +06:30

concerns

user role scoped layout and controller

2017-04-20 22:29:39 +06:30

crm

fixed conflict

2017-06-11 18:09:00 +06:30

oqs

oqs print query update

2017-06-06 10:25:14 +06:30

origami

fixed conflict

2017-06-11 18:09:00 +06:30

settings

edit membership setting , otherpayment page

2017-06-11 15:48:53 +06:30

transactions

origin pull master

2017-06-03 13:44:10 +06:30

application_controller.rb

…

base_controller.rb

…

base_crm_controller.rb

user role scoped layout and controller

2017-04-20 22:29:39 +06:30

base_oqs_controller.rb

frontend view layout

2017-04-21 05:07:00 +06:30

base_origami_controller.rb

frontend view layout

2017-04-21 05:07:00 +06:30

base_waiter_controller.rb

frontend view layout

2017-04-21 05:07:00 +06:30

home_controller.rb

user role scoped layout and controller

2017-04-20 22:29:39 +06:30

install_controller.rb

…

print_settings_controller.rb

origin pull master

2017-06-03 13:44:10 +06:30