Merge remote-tracking branch 'origin/master' into stable-production

2018-05-14 20:26:09 +02:00
parent e55a71e77d 502aae5c27
commit ac7e7f3462
21 changed files with 652 additions and 110 deletions
--- a/2
+++ b/2
@@ -5,7 +5,7 @@ gem 'sprockets', '2.2.2'
 gem 'webrick', '1.3.1'
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
-  gem 'mysql2'
+  gem 'mysql2', '~>0.3.10'
  gem 'sqlite3'
  gem 'execjs', '~>1.4.0'