From 7311f3cbc1c7710835a78f846f80976bb53d7dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sat, 28 Feb 2015 01:11:02 +0100
Subject: [PATCH] bump json

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

diff --git a/Gemfile b/Gemfile
index 5e95c6354..dad543dfa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ gem 'unicorn', '4.8.3', :require => false
 # API and JSON
 
 gem 'acts_as_api', '0.4.2'
-gem 'json',        '1.8.1'
+gem 'json',        '1.8.2'
 
 # Authentication
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 362837420..7b8f485fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -354,7 +354,7 @@ GEM
       execjs (>= 1.4.0)
       multi_json (~> 1.0)
       therubyracer (~> 0.12.1)
-    json (1.8.1)
+    json (1.8.2)
     jwt (1.0.0)
     kaminari (0.16.1)
       actionpack (>= 3.0.0)
@@ -719,7 +719,7 @@ DEPENDENCIES
   js-routes (= 1.0.0)
   js_image_paths (= 0.0.2)
   jshint (= 1.3.1)
-  json (= 1.8.1)
+  json (= 1.8.2)
   markerb (= 1.0.2)
   messagebus_ruby_api (= 1.0.3)
   mini_magick (= 4.0.1)