Zin Lin Phyo 0fbce1ca7c fix conflit

2017-08-31 18:07:05 +06:30

..

environments

disable cable and oqs qty can 0

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

initializers

DataetimepickerInJuty

2017-08-29 13:20:32 +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

fixed conflict

2017-07-03 10:26:26 +06:30

puma.rb.production

…

routes.rb

fix conflit

2017-08-31 18:07:05 +06:30

schedule.rb

update customer rebate

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

secrets.yml

…

sidekiq.yml

fixed at bitp and oqs print

2017-07-03 17:40:12 +06:30

spring.rb

…