fixes conflicts with master

2017-05-31 10:36:38 +02:00
parent 02055bd09a 2382dc56b5
commit 1a46b4d4cb
47 changed files with 537 additions and 61 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -371,6 +371,7 @@ GEM
      ruby-progressbar (~> 1.7)
      unicode-display_width (~> 1.0, >= 1.0.1)
    ruby-progressbar (1.8.1)
+    rubyzip (1.2.1)
    rvm1-capistrano3 (1.4.0)
      capistrano (~> 3.0)
      sshkit (>= 1.2)
@@ -530,6 +531,7 @@ DEPENDENCIES
  rollbar (~> 2.14.1)
  rspec-rails (~> 3.6)
  rubocop (~> 0.48.1)
+  rubyzip (~> 1.2.0)
  rvm1-capistrano3
  sass-rails (~> 5.0, >= 5.0.4)
  savon
@@ -547,4 +549,4 @@ DEPENDENCIES
  whenever

 BUNDLED WITH
-   1.14.6
+   1.15.0