Aung Myo 7dcc777668 fixed conflict

2017-06-12 18:34:41 +06:30

..

api/origami

…

channels

…

crm

…

origami

…

settings

…

transactions

…

application.js

ReceiptList Report Rough

2017-06-12 18:26:00 +06:30

cable.js

print format update

2017-06-12 18:19:30 +06:30

CRM.js

…

membership_actions.coffee

…

OQS.js

…

origami.js

fixed conflict

2017-06-12 18:34:41 +06:30

print_settings.coffee

…