yamin b7f9d56221 fix conflit

2017-08-21 16:35:15 +06:30

..

environments

disable cable and oqs qty can 0

2017-07-04 18:56:52 +06:30

initializers

add bootstrap file input and menu item img implemented

2017-08-15 16:27:40 +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

fix conflit

2017-08-21 16:35:15 +06:30

schedule.rb

update customer rebate

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

secrets.yml

…

sidekiq.yml

…

spring.rb

…