Yan e09559c508 merge with august spring but merge fail

2017-08-31 15:58:01 +06:30

..

environments

…

initializers

merge with august sprint for commission

2017-08-29 18:44:31 +06:30

locales

…

.database.yml.swp

…

application.rb

add CarrierWave gems for menu image upload

2017-08-14 18:53:39 +06:30

boot.rb

…

cable.yml

…

database.yml.sample

…

environment.rb

…

puma.rb

…

puma.rb.production

…

routes.rb

merge with august spring but merge fail

2017-08-31 15:58:01 +06:30

schedule.rb

update customer rebate

2017-07-05 10:34:11 +06:30

secrets.yml

…

sidekiq.yml

…

spring.rb

…