Nweni f6d14de461 fixed conflict

2017-06-11 16:58:18 +06:30

..

api

bill api return updated

2017-06-09 13:33:12 +06:30

concerns

…

crm

update

2017-06-09 13:52:36 +06:30

oqs

…

origami

fixed conflict

2017-06-11 16:58:18 +06:30

settings

edit membership setting , otherpayment page

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

transactions

…

application_controller.rb

…

base_controller.rb

…

base_crm_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

…

base_waiter_controller.rb

…

home_controller.rb

…

install_controller.rb

…

print_settings_controller.rb

…