Commit f44bb613 authored by Lukas Matt's avatar Lukas Matt Committed by Jonne Haß
Browse files

bump diaspora-vines to v0.2.0-develop 



closes #6338

Signed-off-by: default avatarLukas Matt <lukas@zauberstuhl.de>
parent ef6c8a54

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ gem "omniauth-wordpress", "0.2.2" 
gem "active_model_serializers", "0.9.3"



# XMPP chat dependencies

gem "diaspora-vines",             "~> 0.1.28"

gem "diaspora-vines",             "~> 0.2.0.develop"

gem "rails-assets-diaspora_jsxc", "~> 0.1.4.alpha", "< 0.1.4.develop", source: "https://rails-assets.org"



# Tags

Gemfile.lock

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ GEM 
    devise_lastseenable (0.0.6)

      devise

      rails (>= 3.0.4)

    diaspora-vines (0.1.28)

    diaspora-vines (0.2.0.develop.1)

      activerecord (~> 4.1)

      bcrypt (~> 3.1)

      em-hiredis (~> 0.3.0)
@@ -768,7 +768,7 @@ DEPENDENCIES 
  devise (= 3.5.1)

  devise-token_authenticatable (~> 0.4.0)

  devise_lastseenable (= 0.0.6)

  diaspora-vines (~> 0.1.28)

  diaspora-vines (~> 0.2.0.develop)

  diaspora_federation-rails (= 0.0.6)

  entypo-rails (= 2.2.3)

  eye (= 0.7.pre)