Merge branch 'r-1902001-01' into foodcourt

2020-05-29 13:32:16 +06:30
parent d037802a43 8bae89eeac
commit 7c2dd165fc
23 changed files with 724 additions and 508 deletions
--- a/2
+++ b/2
@@ -16,7 +16,7 @@ gem 'rails', '~> 5.1.0'

 #gem 'mysql2', '>= 0.3.18', '< 0.5'
 gem 'pg'
-gem 'mysql2'
+gem 'mysql2', '~> 0.5.2'

 #Use PosgreSQL