Aung Myo 29d5b134da fixed conflict

2017-06-15 09:46:01 +06:30

..

api

…

crm

update customer and sale

2017-06-14 15:58:41 +06:30

home

…

install

…

kaminari

update

2017-06-14 18:56:11 +06:30

layouts

update search and crm

2017-06-14 00:09:54 +06:30

oqs

…

origami

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

2017-06-14 20:08:02 +06:30

print_settings

print setting ui updated

2017-06-14 14:37:23 +06:30

reports

sale update

2017-06-15 09:41:00 +06:30

settings

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

2017-06-14 16:52:54 +06:30

transactions

fixed conflict

2017-06-15 09:46:01 +06:30