pull master

2017-05-31 13:54:01 +06:30
parent 314372ef75
commit 1ed15e2e0d
2 changed files with 1 additions and 3 deletions
--- a/3
+++ b/3
@@ -15,9 +15,6 @@ gem 'mysql2', '>= 0.3.18', '< 0.5'
 # redis server for cable
 gem 'redis', '~> 3.0'

-#gem pg for
-gem 'pg'
-
 # Use Puma as the app server
 gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -233,6 +233,7 @@ DEPENDENCIES
  jbuilder (~> 2.5)
  jquery-rails
  listen (~> 3.0.5)
+  mysql2 (>= 0.3.18, < 0.5)
  pg
  prawn
  prawn-table