Commit 28ca071e authored by Jonne Haß's avatar Jonne Haß Committed by GitHub

Merge pull request #6889 from SuperTux88/bump-federation-gem

bump diaspora_federation to 0.1.1
parents 5d318400 34971836
......@@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4"
# Federation
gem "diaspora_federation-rails", "0.1.0"
gem "diaspora_federation-rails", "0.1.1"
# API and JSON
......@@ -288,7 +288,7 @@ group :test do
gem "webmock", "2.1.0", require: false
gem "shoulda-matchers", "3.1.1"
gem "diaspora_federation-test", "0.1.0"
gem "diaspora_federation-test", "0.1.1"
end
group :development, :test do
......
......@@ -172,17 +172,17 @@ GEM
devise
rails (>= 3.0.4)
diaspora-prosody-config (0.0.5)
diaspora_federation (0.1.0)
diaspora_federation (0.1.1)
faraday (~> 0.9.0)
faraday_middleware (~> 0.10.0)
nokogiri (~> 1.6, >= 1.6.8)
typhoeus (~> 1.0)
valid (~> 1.0)
diaspora_federation-rails (0.1.0)
diaspora_federation (= 0.1.0)
diaspora_federation-rails (0.1.1)
diaspora_federation (= 0.1.1)
rails (~> 4.2)
diaspora_federation-test (0.1.0)
diaspora_federation (= 0.1.0)
diaspora_federation-test (0.1.1)
diaspora_federation (= 0.1.1)
factory_girl (~> 4.7)
diff-lcs (1.2.5)
docile (1.1.5)
......@@ -924,8 +924,8 @@ DEPENDENCIES
devise-token_authenticatable (= 0.4.6)
devise_lastseenable (= 0.0.6)
diaspora-prosody-config (= 0.0.5)
diaspora_federation-rails (= 0.1.0)
diaspora_federation-test (= 0.1.0)
diaspora_federation-rails (= 0.1.1)
diaspora_federation-test (= 0.1.1)
entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.8.1)
factory_girl_rails (= 4.7.0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment