From e712bec4982cf0d3eb959d11d77b7039df15d7cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Mon, 13 Jan 2014 11:45:56 +0100
Subject: [PATCH] bump json

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

diff --git a/Gemfile b/Gemfile
index 23f60c45a..41c09590e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem 'unicorn', '4.8.0', :require => false
 # API and JSON
 
 gem 'acts_as_api', '0.4.2'
-gem 'json',        '1.8.0'
+gem 'json',        '1.8.1'
 
 # Authentication
 
diff --git a/Gemfile.lock b/Gemfile.lock
index fc84c3d00..60d5b83e3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -192,7 +192,7 @@ GEM
     jquery-ui-rails (3.0.1)
       jquery-rails
       railties (>= 3.1.0)
-    json (1.8.0)
+    json (1.8.1)
     jwt (0.1.10)
       multi_json (>= 1.5)
     kaminari (0.14.1)
@@ -462,7 +462,7 @@ DEPENDENCIES
   i18n-inflector-rails (= 1.0.7)
   jasmine (= 1.3.2)
   jquery-rails (= 2.1.4)
-  json (= 1.8.0)
+  json (= 1.8.1)
   markerb (= 1.0.1)
   messagebus_ruby_api (= 1.0.3)
   mini_magick (= 3.7.0)