Min Zeya Phyo 1ea9125f80 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant ...

# Conflicts:
#	Gemfile.lock
#	app/views/layouts/application.html.erb

2017-06-26 21:57:55 +06:30

..

api

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

2017-06-22 18:05:38 +06:30

crm

update crm customer

2017-06-26 20:13:56 +06:30

home

New Login form

2017-06-26 21:56:13 +06:30

install

basic layout template

2017-04-05 08:24:21 +06:30

kaminari

update

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

layouts

New Login form

2017-06-26 21:56:13 +06:30

oqs

add table and order no in oqs

2017-06-26 16:23:00 +06:30

origami

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

2017-06-26 19:28:21 +06:30

print_settings

print setting ui updated

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

reports

update home link

2017-06-26 20:44:15 +06:30

settings

merge with settings_backend

2017-06-26 14:46:31 +06:30

transactions

update credit

2017-06-26 19:02:36 +06:30