Nweni f6d14de461 fixed conflict

2017-06-11 16:58:18 +06:30

..

assets

fixed conflict

2017-06-11 15:52:13 +06:30

channels

…

controllers

fixed conflict

2017-06-11 16:58:18 +06:30

forms

…

helpers

edit membership setting , otherpayment page

2017-06-11 15:48:53 +06:30

jobs

updated default who changed oqs in queue job

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

mailers

…

models

payment

2017-06-11 16:57:31 +06:30

pdf

update print

2017-06-08 16:52:50 +06:30

reports

…

views

fixed conflict

2017-06-11 16:58:18 +06:30