Merge pull request #6488 from Zauberstuhl/bump_vines_jsxc

Bump jsxc to v0.1.4.develop.3
This commit is contained in:
Jason Robinson 2015-10-10 20:45:50 +02:00
commit 7f70f411fc

View file

@ -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)