nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-09-19 11:36:41 +02:00
commit c7a00018fc
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -12,7 +12,7 @@ gem "unicorn", "4.9.0", require: false
# Federation # Federation
gem "diaspora_federation-rails", "0.0.6" gem "diaspora_federation-rails", "0.0.7"
# API and JSON # API and JSON

10
Gemfile.lock
View file

@ -154,14 +154,14 @@ GEM
eventmachine (>= 1.0.5, < 1.1) eventmachine (>= 1.0.5, < 1.1)
http_parser.rb (~> 0.6) http_parser.rb (~> 0.6)
nokogiri (~> 1.6) nokogiri (~> 1.6)
diaspora_federation (0.0.6) diaspora_federation (0.0.7)
faraday (~> 0.9.0) faraday (~> 0.9.0)
faraday_middleware (~> 0.10.0) faraday_middleware (~> 0.10.0)
nokogiri (~> 1.6, >= 1.6.6) nokogiri (~> 1.6, >= 1.6.6)
typhoeus (~> 0.7.0) typhoeus (~> 0.7.0)
valid (~> 1.0.0) valid (~> 1.0)
diaspora_federation-rails (0.0.6) diaspora_federation-rails (0.0.7)
diaspora_federation (= 0.0.6) diaspora_federation (= 0.0.7)
rails (~> 4.2) rails (~> 4.2)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
@ -803,7 +803,7 @@ DEPENDENCIES
devise-token_authenticatable (~> 0.4.0) devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.6) devise_lastseenable (= 0.0.6)
diaspora-vines (~> 0.2.0.develop) diaspora-vines (~> 0.2.0.develop)
diaspora_federation-rails (= 0.0.6) diaspora_federation-rails (= 0.0.7)
entypo-rails (= 3.0.0.pre.rc2) entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.7.pre) eye (= 0.7.pre)
factory_girl_rails (= 4.5.0) factory_girl_rails (= 4.5.0)