Nweni 0cc378f318 fixed conflict

2017-06-06 09:43:16 +06:30

..

channels

…

origami

added new image upload file

2017-06-05 17:14:07 +06:30

settings

…

transactions

…

application.js

…

cable.js

…

OQS.js

oqs printing

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

orgiami.js

…

print_settings.coffee

…