Commit 94f73be7 authored by zauberstuhl's avatar zauberstuhl
Browse files

bump Vines to v0.1.27 and Jsxc to v0.0.12

parent 30685b27
......@@ -136,8 +136,8 @@ gem 'twitter', '4.8.1'
gem 'omniauth-wordpress','0.2.1'
# XMPP chat dependencies
gem 'diaspora-vines', '~> 0.1.25'
gem 'rails-assets-diaspora_jsxc', '~> 0.0.9'
gem 'diaspora-vines', '~> 0.1.27'
gem 'rails-assets-diaspora_jsxc', '~> 0.0.12'
# Tags
......
......@@ -137,11 +137,11 @@ GEM
rails (>= 3.0.4)
warden
warden
diaspora-vines (0.1.25)
activerecord (~> 4.1.4)
diaspora-vines (0.1.27)
activerecord (~> 4.1)
bcrypt (~> 3.1)
em-hiredis (~> 0.3.0)
eventmachine (~> 1.0)
eventmachine (>= 1.0.5, < 1.1)
http_parser.rb (~> 0.6)
nokogiri (~> 1.6)
diff-lcs (1.2.5)
......@@ -161,7 +161,7 @@ GEM
erubis (2.7.0)
ethon (0.7.1)
ffi (>= 1.3.0)
eventmachine (1.0.4)
eventmachine (1.0.7)
excon (0.41.0)
execjs (2.2.2)
factory_girl (4.5.0)
......@@ -423,7 +423,7 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.8)
sprockets-rails (~> 2.0)
rails-assets-diaspora_jsxc (0.0.10)
rails-assets-diaspora_jsxc (0.0.12)
rails-assets-jquery (~> 1.11.1)
rails-assets-jquery-colorbox (~> 1.5.14)
rails-assets-jquery-fullscreen (~> 1.1.4)
......@@ -646,7 +646,7 @@ DEPENDENCIES
devise (= 3.4.1)
devise-token_authenticatable (~> 0.3.0)
devise_lastseenable (= 0.0.4)
diaspora-vines (~> 0.1.25)
diaspora-vines (~> 0.1.27)
entypo-rails (= 2.2.2)
factory_girl_rails (= 4.5.0)
faraday (= 0.9.0)
......@@ -695,7 +695,7 @@ DEPENDENCIES
rack-rewrite (= 1.5.0)
rack-ssl (= 1.4.1)
rails (= 4.1.8)
rails-assets-diaspora_jsxc (~> 0.0.9)
rails-assets-diaspora_jsxc (~> 0.0.12)
rails-assets-jasmine-ajax (= 3.0.0)
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)
rails-assets-jquery (= 1.11.1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment