Moe Su 7ac89829d1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-11 17:40:53 +06:30

..

assets

fixed conflict

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

channels

…

controllers

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-11 17:40:53 +06:30

forms

…

helpers

edit membership setting , otherpayment page

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

jobs

…

mailers

…

models

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-11 17:40:53 +06:30

pdf

…

reports

…

views

redeem process

2017-06-11 17:40:44 +06:30