Merge 471fee7 into 3098ef7

Gemfile.lock

@@ -75,7 +75,7 @@ GEM
     chronic (0.9.1)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.1)
+    cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.0)
     connection_pool (2.1.0)
@@ -166,9 +166,10 @@ GEM
       webrobots (>= 0.0.9, < 0.2)
     method_source (0.8.2)
     mime-types (1.25.1)
+    mimemagic (0.3.0)
     mini_portile (0.6.2)
     mono_logger (1.1.0)
-    multi_json (1.10.1)
+    multi_json (1.11.2)
     multi_test (0.1.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -191,12 +192,12 @@ GEM
     nokogiri (1.6.6.2-x86-mingw32)
       mini_portile (~> 0.6.0)
     ntlm-http (0.1.1)
-    paperclip (3.4.2)
-      activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      cocaine (~> 0.5.0)
+    paperclip (4.3.2)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      cocaine (~> 0.5.5)
       mime-types
+      mimemagic (= 0.3.0)
     permit_yo (2.1.4)
       activesupport (~> 3.0)
     phrase (0.4.33)