Nweni f035c2fe10 fixed conflict

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

..

deploy

…

environments

…

initializers

change config for local server

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

locales

…

.database.yml.swp

…

application.rb

…

boot.rb

…

cable.yml

change config for local server

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

deploy.rb

…

environment.rb

…

puma.rb

…

redis.yml

change config for local server

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

routes.rb

…

schedule.rb

…

secrets.yml

change config for local server

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

shops.json

…

sidekiq.yml

…

spring.rb

…