Yan 6a09ef3018 merge with crm and room fixed

2017-07-03 17:47:34 +06:30

..

environments

…

initializers

update report and customer

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

locales

…

.database.yml.swp

before pull

2017-06-30 14:19:30 +06:30

application.rb

merge with crm

2017-06-29 13:40:30 +06:30

boot.rb

…

cable.yml

…

database.yml.sample

…

environment.rb

update crm

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

puma.rb

fixed conflict

2017-07-03 10:26:26 +06:30

puma.rb.production

…

routes.rb

update shift close print

2017-07-01 20:05:26 +06:30

schedule.rb

crong job and close cashier

2017-07-02 09:37:19 +06:30

secrets.yml

…

sidekiq.yml

fixed at bitp and oqs print

2017-07-03 17:40:12 +06:30

spring.rb

…