merge with origin master

2017-06-22 18:06:56 +06:30
parent 139c3c997a
commit a90bbbebec
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0'
 gem 'mysql2', '>= 0.3.18', '< 0.5'

 #Use PosgreSQL
-gem 'pg'
+# gem 'pg'

 # redis server for cable
 # gem 'redis', '~> 3.0'