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/1
+++ b/1
@@ -64,6 +64,7 @@ gem 'tolk', '~> 2.0.0' # Web interface for translations
 gem 'browser'
 gem 'turnout', '~> 2.4.0'
 gem 'redcarpet', '~> 3.4.0'
+gem 'rubyzip', '~> 1.2.0'

 gem 'paperclip'
 gem 'rails-assets-markdown-it', source: 'https://rails-assets.org'