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-20 00:21:33 +02:00
commit 7714b83a72
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

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

10
Gemfile.lock
View file

@ -49,7 +49,7 @@ GEM
activesupport (>= 3.0.0)
rack (>= 1.1.0)
addressable (2.3.8)
arel (6.0.2)
arel (6.0.3)
asset_sync (1.1.0)
activemodel
fog (>= 1.8.0)
@ -147,7 +147,7 @@ GEM
devise_lastseenable (0.0.6)
devise
rails (>= 3.0.4)
diaspora-vines (0.1.27)
diaspora-vines (0.1.28)
activerecord (~> 4.1)
bcrypt (~> 3.1)
em-hiredis (~> 0.3.0)
@ -178,7 +178,7 @@ GEM
erubis (2.7.0)
ethon (0.7.4)
ffi (>= 1.3.0)
eventmachine (1.0.7)
eventmachine (1.0.8)
excon (0.45.4)
execjs (2.5.2)
eye (0.7.pre)
@ -426,7 +426,7 @@ GEM
mime-types (2.6.1)
mini_magick (4.2.7)
mini_portile (0.6.2)
minitest (5.7.0)
minitest (5.8.0)
mobile-fu (1.3.1)
rack-mobile-detect
rails
@ -788,7 +788,7 @@ DEPENDENCIES
devise (= 3.5.1)
devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.6)
diaspora-vines (~> 0.1.27)
diaspora-vines (~> 0.1.28)
diaspora_federation-rails (= 0.0.3)
entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.7.pre)