nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-07-16 10:47:36 +02:00
commit 99aa354052
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -129,7 +129,7 @@ gem "messagebus_ruby_api", "1.0.3"
# Parsing # Parsing
gem "nokogiri", "1.6.6.2" gem "nokogiri", "1.6.6.2"
gem "redcarpet", "3.3.1" gem "redcarpet", "3.3.2"
gem "twitter-text", "1.12.0" gem "twitter-text", "1.12.0"
gem "roxml", "3.1.6" gem "roxml", "3.1.6"
gem "ruby-oembed", "0.8.14" gem "ruby-oembed", "0.8.14"

6
Gemfile.lock
View file

@ -609,7 +609,7 @@ GEM
rb-fsevent (0.9.5) rb-fsevent (0.9.5)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
redcarpet (3.3.1) redcarpet (3.3.2)
redis (3.2.1) redis (3.2.1)
redis-namespace (1.5.2) redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4) redis (~> 3.0, >= 3.0.4)
@ -786,8 +786,8 @@ DEPENDENCIES
devise-token_authenticatable (~> 0.4.0) devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.4) devise_lastseenable (= 0.0.4)
diaspora-vines (~> 0.1.27) diaspora-vines (~> 0.1.27)
entypo-rails (= 3.0.0.pre.rc2)
diaspora_federation-rails (= 0.0.3) diaspora_federation-rails (= 0.0.3)
entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.7.pre) eye (= 0.7.pre)
factory_girl_rails (= 4.5.0) factory_girl_rails (= 4.5.0)
faraday (= 0.9.1) faraday (= 0.9.1)
@ -866,7 +866,7 @@ DEPENDENCIES
rails_admin (= 0.6.8) rails_admin (= 0.6.8)
rb-fsevent (= 0.9.5) rb-fsevent (= 0.9.5)
rb-inotify (= 0.9.5) rb-inotify (= 0.9.5)
redcarpet (= 3.3.1) redcarpet (= 3.3.2)
remotipart (= 1.2.1) remotipart (= 1.2.1)
responders (= 2.1.0) responders (= 2.1.0)
roxml (= 3.1.6) roxml (= 3.1.6)