From f89fc53b17356e57e45a3168e1fcc424315c55cc Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@zauberstuhl.de>
Date: Sat, 10 Oct 2015 20:42:21 +0200
Subject: [PATCH] bump jsxc to v0.1.4.develop.3
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
---
Gemfile.lock | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index dce22eff79..6cbc80d47b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -559,12 +559,10 @@ GEM
sprockets-rails
rails-assets-autosize (3.0.13)
rails-assets-blueimp-gallery (2.16.0)
- rails-assets-colorbox (1.6.3)
- rails-assets-jquery (>= 1.3.2)
- rails-assets-diaspora_jsxc (0.1.4.develop.1)
- rails-assets-colorbox (= 1.6.3)
+ rails-assets-diaspora_jsxc (0.1.4.develop.3)
rails-assets-favico.js (= 0.3.9)
rails-assets-jquery (= 1.11.2)
+ rails-assets-jquery-colorbox (= 1.6.3)
rails-assets-jquery-fullscreen-plugin (= 0.5.0)
rails-assets-jquery.slimscroll (= 1.3.6)
rails-assets-jquery.ui (= 1.11.4)
@@ -578,6 +576,8 @@ GEM
rails-assets-jeresig--jquery.hotkeys (0.2.0)
rails-assets-jquery (>= 1.4.2)
rails-assets-jquery (1.11.2)
+ rails-assets-jquery-colorbox (1.6.3)
+ rails-assets-jquery (>= 1.3.2)
rails-assets-jquery-fullscreen-plugin (0.5.0)
rails-assets-jquery-placeholder (2.1.2)
rails-assets-jquery (>= 1.6)
--
GitLab