Aung Myo 406172c6ff fixed conflict

2017-06-09 12:04:36 +06:30

..

api

fixed conflict

2017-06-09 12:04:36 +06:30

concerns

…

crm

fixed conflict

2017-06-09 12:04:36 +06:30

oqs

…

origami

cash payment complete

2017-06-09 11:25:30 +06:30

settings

Add membership action

2017-06-09 02:23:16 +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

…