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:
Dennis Schubert 2015-07-15 01:38:45 +02:00
commit 0401de0e8a
2 changed files with 5 additions and 5 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.2" gem "diaspora_federation-rails", "0.0.3"
# API and JSON # API and JSON

8
Gemfile.lock
View file

@ -155,10 +155,10 @@ 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.2) diaspora_federation (0.0.3)
nokogiri (~> 1.6, >= 1.6.6) nokogiri (~> 1.6, >= 1.6.6)
diaspora_federation-rails (0.0.2) diaspora_federation-rails (0.0.3)
diaspora_federation (= 0.0.2) diaspora_federation (= 0.0.3)
rails (~> 4.2) rails (~> 4.2)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
@ -786,8 +786,8 @@ DEPENDENCIES
devise-token_authenticatable (~> 0.4.0) devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.4) devise_lastseenable (= 0.0.4)
diaspora-vines (~> 0.1.27) diaspora-vines (~> 0.1.27)
diaspora_federation-rails (= 0.0.2)
entypo-rails (= 3.0.0.pre.rc2) entypo-rails (= 3.0.0.pre.rc2)
diaspora_federation-rails (= 0.0.3)
eye (= 0.7.pre) eye (= 0.7.pre)
factory_girl_rails (= 4.5.0) factory_girl_rails (= 4.5.0)
faraday (= 0.9.1) faraday (= 0.9.1)