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

2017-06-26 18:46:16 +06:30

..

assets

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

2017-06-26 16:38:15 +06:30

channels

…

controllers

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

2017-06-26 18:46:16 +06:30

forms

…

helpers

update authorize

2017-06-23 09:41:48 +06:30

jobs

…

mailers

…

models

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

2017-06-26 18:46:16 +06:30

pdf

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

2017-06-26 18:45:55 +06:30

reports

…

views

route conflit fix

2017-06-26 18:02:08 +06:30