superuser ca797b8d9c update conflict file

2017-07-02 14:37:21 +06:30

..

environments

after pull

2017-06-15 11:54:45 +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

.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

init project commit

2017-03-24 19:58:23 +06:30

cable.yml

init project commit

2017-03-24 19:58:23 +06:30

database.yml.sample

more controller for cashier/waiter view

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

environment.rb

update crm

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

puma.rb

before pull

2017-06-15 11:53:27 +06:30

puma.rb.production

Puma for production

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

puma.rb.save

before pull

2017-06-15 14:07:54 +06:30

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

before pull

2017-06-14 18:57:10 +06:30

sidekiq.yml

before pull

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

spring.rb

init project commit

2017-03-24 19:58:23 +06:30