Aung Myo 406172c6ff fixed conflict

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

..

api/restaurant

…

crm

queue and crm view updated

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

settings

payment_setting

2017-06-08 17:57:29 +06:30

transactions

…

employees_spec.rb

…

membership_actions_spec.rb

payment_setting

2017-06-08 17:57:29 +06:30

print_settings_spec.rb

…