From f4fa7e10bdb67aaa5da6221f69e85299d5355474 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 24 Mar 2019 00:21:37 +0100
Subject: [PATCH] Bump json

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

diff --git a/Gemfile b/Gemfile
index 2aaaf1da4..fe9efa706 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem "diaspora_federation-rails", "0.2.5"
 # API and JSON
 
 gem "acts_as_api", "1.0.1"
-gem "json",        "2.1.0"
+gem "json",        "2.2.0"
 gem "json-schema", "2.8.1"
 
 # Authentication
diff --git a/Gemfile.lock b/Gemfile.lock
index 2c908bd98..b6e6dce7a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -340,7 +340,7 @@ GEM
     js_image_paths (0.1.1)
       rails (>= 4.0, < 6.0)
       sprockets (>= 3.0.0)
-    json (2.1.0)
+    json (2.2.0)
     json-jwt (1.9.4)
       activesupport
       aes_key_wrap
@@ -812,7 +812,7 @@ DEPENDENCIES
   jquery-rails (= 4.3.3)
   js-routes (= 1.4.4)
   js_image_paths (= 0.1.1)
-  json (= 2.1.0)
+  json (= 2.2.0)
   json-schema (= 2.8.1)
   json-schema-rspec (= 0.0.4)
   leaflet-rails (= 1.3.1)