Merge branch 'r-1902001-01' into foodcourt

This commit is contained in:
Thein Lin Kyaw
2020-07-11 04:00:55 +06:30
99 changed files with 2085 additions and 1781 deletions

1
.gitignore vendored
View File

@@ -43,6 +43,7 @@ pickle-email-*.html
/config/initializers/*
config/deploy/config/*
#config/puma.rb
config/license.yml
config/shops.json
config/license.yml