From b2aaf87334f06818944aa71c7939a5f0b536baa4 Mon Sep 17 00:00:00 2001
From: Dennis Schubert <mail@dennis-schubert.de>
Date: Thu, 25 Jun 2015 03:36:03 +0200
Subject: [PATCH] bump paperclip

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 74f30a9..c4b5691 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'turbolinks'
 gem 'will_paginate-bootstrap'
 
 gem 'redcarpet', '~> 3.2'
-gem 'paperclip', '~> 4.1'
+gem 'paperclip', '~> 4.3'
 
 gem 'feedjira', github: 'feedjira/feedjira'
 gem 'trollop', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index b8bc14c..8b05420 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,6 +117,7 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.6.1)
+    mimemagic (0.3.0)
     mini_portile (0.6.2)
     minitest (5.7.0)
     multipart-post (2.0.0)
@@ -127,11 +128,12 @@ GEM
     nokogumbo (1.4.1)
       nokogiri
     orm_adapter (0.5.0)
-    paperclip (4.2.3)
+    paperclip (4.3.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
       mime-types
+      mimemagic (= 0.3.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -269,7 +271,7 @@ DEPENDENCIES
   fuubar (~> 2.0.0)
   jquery-rails
   mysql2
-  paperclip (~> 4.1)
+  paperclip (~> 4.3)
   pry
   rails (~> 4.2.0)
   rails_admin