Nweni 285f5d4cd0 fixed conflict

2018-04-23 18:21:47 +06:30

..

assets

update action cable for order resservation

2018-04-22 14:11:04 +06:30

channels

update action cable for order resservation

2018-04-22 14:11:04 +06:30

controllers

fixed conflict

2018-04-23 18:21:47 +06:30

forms

…

helpers

…

inputs

…

jobs

…

mailers

…

models

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

2018-04-23 16:23:35 +06:30

pdf

update bugs for demo

2018-04-22 16:38:52 +06:30

reports

…

uploaders

Second Display Image finished

2018-03-29 10:03:21 +06:30

views

fixed conflict

2018-04-23 18:21:47 +06:30