Merge branch 'next-minor' into develop

Gemfile

@@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4"
 
 # Federation
 
-gem "diaspora_federation-rails", "0.1.8"
+gem "diaspora_federation-rails", "0.1.9"
 
 # API and JSON
 
@@ -296,7 +296,7 @@ group :test do
   gem "webmock",            "2.3.2", require: false
   gem "shoulda-matchers",   "3.1.1"
 
-  gem "diaspora_federation-test", "0.1.8"
+  gem "diaspora_federation-test", "0.1.9"
 
   # Coverage
   gem 'coveralls', require: false

Gemfile.lock

@@ -170,17 +170,17 @@ GEM
       devise
       rails (>= 3.0.4)
     diaspora-prosody-config (0.0.7)
-    diaspora_federation (0.1.8)
+    diaspora_federation (0.1.9)
       faraday (>= 0.9.0, < 0.12.0)
       faraday_middleware (>= 0.10.0, < 0.12.0)
       nokogiri (~> 1.6, >= 1.6.8)
       typhoeus (~> 1.0)
       valid (~> 1.0)
-    diaspora_federation-rails (0.1.8)
-      diaspora_federation (= 0.1.8)
+    diaspora_federation-rails (0.1.9)
+      diaspora_federation (= 0.1.9)
       rails (>= 4.2, < 6)
-    diaspora_federation-test (0.1.8)
-      diaspora_federation (= 0.1.8)
+    diaspora_federation-test (0.1.9)
+      diaspora_federation (= 0.1.9)
       factory_girl (~> 4.7)
       uuid (~> 2.3.8)
     diff-lcs (1.3)
@@ -217,7 +217,7 @@ GEM
       http-cookie (~> 1.0.0)
     faraday_middleware (0.11.0.1)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.17)
+    ffi (1.9.18)
     fixture_builder (0.4.1)
       activerecord (>= 2)
       activesupport (>= 2)
@@ -805,8 +805,8 @@ DEPENDENCIES
   devise (= 4.2.0)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)
-  diaspora_federation-rails (= 0.1.8)
-  diaspora_federation-test (= 0.1.8)
+  diaspora_federation-rails (= 0.1.9)
+  diaspora_federation-test (= 0.1.9)
   entypo-rails (= 3.0.0)
   eye (= 0.9.1)
   factory_girl_rails (= 4.8.0)