From e8f57d8faca210e6748c5d80eb0cfef68ebbff29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 17 May 2013 13:19:00 +0200
Subject: [PATCH] Revert "downgrade multi_json"

This reverts commit 4c4a98f42e455c53018251584ec8dbf6b15792b1.
---
 Gemfile      | 1 -
 Gemfile.lock | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2011cd7c0..1de06336a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,7 +64,6 @@ gem 'rails_autolink', '1.0.9'
 gem 'redcarpet',      '2.2.2'
 gem 'roxml',          '3.1.6'
 gem 'ruby-oembed',    '0.8.8'
-gem 'multi_json',     '1.7.2'
 
 # Services
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 37c97e2df..18b02bc59 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -209,7 +209,7 @@ GEM
     mobile-fu (1.1.1)
       rack-mobile-detect
       rails
-    multi_json (1.7.2)
+    multi_json (1.7.3)
     multipart-post (1.2.0)
     mysql2 (0.3.11)
     nested_form (0.3.2)
@@ -443,7 +443,6 @@ DEPENDENCIES
   messagebus_ruby_api (= 1.0.3)
   mini_magick (= 3.5)
   mobile-fu (= 1.1.1)
-  multi_json (= 1.7.2)
   mysql2 (= 0.3.11)
   nokogiri (= 1.5.9)
   omniauth (= 1.1.4)