Nweni d2caba3f03 fixed conflict

2017-06-12 13:27:33 +06:30

..

assets

Update

2017-06-12 13:26:09 +06:30

channels

…

controllers

fixed conflict

2017-06-12 13:27:33 +06:30

forms

move login_from from model folder to form folder

2017-06-04 16:28:29 +06:30

helpers

merge with master

2017-06-12 10:01:36 +06:30

jobs

updated default who changed oqs in queue job

2017-06-08 19:26:47 +06:30

mailers

…

models

fixed conflict

2017-06-12 13:27:33 +06:30

pdf

to do req_bill_format and status changed after pay

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

reports

…

views

fixed conflict

2017-06-12 13:27:33 +06:30