Nweni f035c2fe10 fixed conflict

2019-11-28 14:19:37 +06:30

..

deploy

production deployment changes

2019-10-25 12:44:17 +06:30

environments

update add ordr

2018-05-14 13:34:14 +06:30

initializers

change config for local server

2019-11-19 00:08:56 +06:30

locales

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

2018-10-05 10:21:45 +06:30

.database.yml.swp

commit from production server

2019-11-15 14:17:50 +06:30

application.rb

…

boot.rb

…

cable.yml

change config for local server

2019-11-19 00:08:56 +06:30

deploy.rb

docker changes

2019-10-29 10:38:50 +06:30

environment.rb

…

puma.rb

gem

2019-11-15 14:20:59 +06:30

redis.yml

change config for local server

2019-11-19 00:08:56 +06:30

routes.rb

add staff meal

2019-11-18 09:57:55 +06:30

schedule.rb

…

secrets.yml

change config for local server

2019-11-19 00:08:56 +06:30

shops.json

commit from production server

2019-11-15 14:17:50 +06:30

sidekiq.yml

…

spring.rb

…