Commit 99aa3540 authored by Jonne Haß's avatar Jonne Haß

Merge branch 'stable' into develop

parents 0f51d89b e7a2775c
......@@ -129,7 +129,7 @@ gem "messagebus_ruby_api", "1.0.3"
# Parsing
gem "nokogiri", "1.6.6.2"
gem "redcarpet", "3.3.1"
gem "redcarpet", "3.3.2"
gem "twitter-text", "1.12.0"
gem "roxml", "3.1.6"
gem "ruby-oembed", "0.8.14"
......
......@@ -609,7 +609,7 @@ GEM
rb-fsevent (0.9.5)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
redcarpet (3.3.1)
redcarpet (3.3.2)
redis (3.2.1)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
......@@ -786,8 +786,8 @@ DEPENDENCIES
devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.4)
diaspora-vines (~> 0.1.27)
entypo-rails (= 3.0.0.pre.rc2)
diaspora_federation-rails (= 0.0.3)
entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.7.pre)
factory_girl_rails (= 4.5.0)
faraday (= 0.9.1)
......@@ -866,7 +866,7 @@ DEPENDENCIES
rails_admin (= 0.6.8)
rb-fsevent (= 0.9.5)
rb-inotify (= 0.9.5)
redcarpet (= 3.3.1)
redcarpet (= 3.3.2)
remotipart (= 1.2.1)
responders (= 2.1.0)
roxml (= 3.1.6)
......
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