From f44bb613b95ea02a7506fa8a2e9e865f344fc8ae Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@zauberstuhl.de>
Date: Sat, 22 Aug 2015 21:17:27 +0200
Subject: [PATCH] bump diaspora-vines to v0.2.0-develop
closes #6338
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index e52db97924..18348e6937 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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
diff --git a/Gemfile.lock b/Gemfile.lock
index a718a9affb..2332bd4f71 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
--
GitLab