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

..

environments

Bug Fix with Production

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

initializers

update report and customer

2017-06-22 13:35:20 +06:30

locales

queue and crm view updated

2017-06-09 09:29:25 +06:30

application.rb

update crm customer

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

boot.rb

…

cable.yml

…

database.yml.sample

…

environment.rb

update crm

2017-06-21 10:05:07 +06:30

puma.rb

…

puma.rb.production

Puma for production

2017-06-15 12:30:13 +06:30

routes.rb

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

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

secrets.yml

…

sidekiq.yml

…

spring.rb

…