From 4a75ad43c8dee35e7c0e4c3a2de53a9e2d6611fe Mon Sep 17 00:00:00 2001
From: Dennis Schubert <mail@dennis-schubert.de>
Date: Tue, 9 Feb 2016 16:25:56 +0100
Subject: [PATCH] Bump webmock

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

diff --git a/Gemfile b/Gemfile
index 55166fc6b..67035dc7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -267,7 +267,7 @@ group :test do
 
   gem "factory_girl_rails", "4.5.0"
   gem "timecop",            "0.8.0"
-  gem "webmock",            "1.22.3", require: false
+  gem "webmock",            "1.22.6", require: false
   gem "shoulda-matchers",   "3.1.1"
 
   gem "diaspora_federation-test", "0.0.12"
diff --git a/Gemfile.lock b/Gemfile.lock
index 968c3c4ff..92c905a52 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -764,7 +764,7 @@ GEM
     valid (1.1.0)
     warden (1.2.6)
       rack (>= 1.0)
-    webmock (1.22.3)
+    webmock (1.22.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -903,7 +903,7 @@ DEPENDENCIES
   uglifier (= 2.7.2)
   unicorn (= 5.0.1)
   uuid (= 2.3.8)
-  webmock (= 1.22.3)
+  webmock (= 1.22.6)
   will_paginate (= 3.1.0)
 
 BUNDLED WITH