Aung Myo 406172c6ff fixed conflict

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

..

api/origami

For pull

2017-06-07 18:11:03 +06:30

channels

…

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

…

application.js

finished customer and join membership in crm

2017-06-07 16:38:24 +06:30

cable.js

…

CRM.js

update crm layout

2017-06-09 11:55:50 +06:30

membership_actions.coffee

payment_setting

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

OQS.js

oqs printing

2017-06-04 18:25:09 +06:30

origami.js

update assets

2017-06-09 11:33:21 +06:30

print_settings.coffee

…