From bfcb1c3c8805624e6f85e22f23e1d0cebb9b58fc Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@zauberstuhl.de>
Date: Fri, 21 Aug 2015 13:04:28 +0200
Subject: [PATCH] bump diaspora_jsxc to v0.1.4-develop
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 17844094da..4b4bb3b016 100644
--- a/Gemfile
+++ b/Gemfile
@@ -151,7 +151,7 @@ gem "active_model_serializers", "0.9.3"
# XMPP chat dependencies
gem "diaspora-vines", "~> 0.1.28"
-gem "rails-assets-diaspora_jsxc", "~> 0.1.3", source: "https://rails-assets.org"
+gem "rails-assets-diaspora_jsxc", "~> 0.1.4.develop", source: "https://rails-assets.org"
# Tags
diff --git a/Gemfile.lock b/Gemfile.lock
index c3c08ea937..f7e89f649d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -537,7 +537,7 @@ GEM
rails-assets-autosize (3.0.8)
rails-assets-colorbox (1.6.3)
rails-assets-jquery (>= 1.3.2)
- rails-assets-diaspora_jsxc (0.1.3)
+ rails-assets-diaspora_jsxc (0.1.4.develop.1)
rails-assets-colorbox (= 1.6.3)
rails-assets-favico.js (= 0.3.9)
rails-assets-jquery (= 1.11.2)
@@ -848,7 +848,7 @@ DEPENDENCIES
rack-ssl (= 1.4.1)
rails (= 4.2.3)
rails-assets-autosize (= 3.0.8)!
- rails-assets-diaspora_jsxc (~> 0.1.3)!
+ rails-assets-diaspora_jsxc (~> 0.1.4.develop)!
rails-assets-highlightjs (= 8.6.0)!
rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
rails-assets-jasmine-ajax (= 3.2.0)!
--
GitLab