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-08-22 21:53:19 +02:00
commit 515d2ba9d5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -150,7 +150,7 @@ gem "omniauth-wordpress", "0.2.2"
gem "active_model_serializers", "0.9.3" gem "active_model_serializers", "0.9.3"
# XMPP chat dependencies # XMPP chat dependencies
gem "diaspora-vines", "~> 0.1.28" gem "diaspora-vines", "~> 0.2.0.develop"
gem "rails-assets-diaspora_jsxc", "~> 0.1.4.develop", source: "https://rails-assets.org" gem "rails-assets-diaspora_jsxc", "~> 0.1.4.develop", source: "https://rails-assets.org"
# Tags # Tags

4
Gemfile.lock
View file

@ -147,7 +147,7 @@ GEM
devise_lastseenable (0.0.6) devise_lastseenable (0.0.6)
devise devise
rails (>= 3.0.4) rails (>= 3.0.4)
diaspora-vines (0.1.28) diaspora-vines (0.2.0.develop.1)
activerecord (~> 4.1) activerecord (~> 4.1)
bcrypt (~> 3.1) bcrypt (~> 3.1)
em-hiredis (~> 0.3.0) em-hiredis (~> 0.3.0)
@ -793,7 +793,7 @@ DEPENDENCIES
devise (= 3.5.1) devise (= 3.5.1)
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.1.28) diaspora-vines (~> 0.2.0.develop)
diaspora_federation-rails (= 0.0.6) diaspora_federation-rails (= 0.0.6)
entypo-rails (= 3.0.0.pre.rc2) entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.7.pre) eye (= 0.7.pre)