Phyo 4958cb6872 Merge branch 'master' into settings_backend

2017-06-23 19:22:20 +06:30

..

assets

merge origin master

2017-06-23 17:53:53 +06:30

channels

…

controllers

fix with merge

2017-06-23 19:20:00 +06:30

forms

update

2017-06-14 18:56:11 +06:30

helpers

…

jobs

update order for oqs

2017-06-16 18:55:14 +06:30

mailers

…

models

Rebate Redeem add field

2017-06-23 18:45:15 +06:30

pdf

accounts and discount updated

2017-06-23 17:05:08 +06:30

reports

update

2017-06-14 18:56:11 +06:30

views

merge origin master

2017-06-23 17:53:53 +06:30