Commit c83650f0 authored by Jonne Haß's avatar Jonne Haß

Merge branch 'stable' into develop

parents 1be1bec9 034fc5b1
......@@ -46,7 +46,6 @@ bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
## Features
* Add configuration options for some debug logs [#6090](https://github.com/diaspora/diaspora/pull/6090)
# 0.5.1.0
## Refactor
......
......@@ -95,7 +95,7 @@ gem "js-routes", "1.0.1"
source "https://rails-assets.org" do
gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails
gem "rails-assets-markdown-it", "4.2.1"
gem "rails-assets-markdown-it", "4.2.2"
gem "rails-assets-markdown-it-hashtag", "0.3.1"
gem "rails-assets-markdown-it-diaspora-mention", "0.3.0"
gem "rails-assets-markdown-it-sanitizer", "0.3.1"
......
......@@ -547,7 +547,7 @@ GEM
rails-assets-jquery.slimscroll (1.3.3)
rails-assets-jquery (>= 1.7)
rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
rails-assets-markdown-it (4.2.1)
rails-assets-markdown-it (4.2.2)
rails-assets-markdown-it-diaspora-mention (0.3.0)
rails-assets-markdown-it-hashtag (0.3.1)
rails-assets-markdown-it-sanitizer (0.3.1)
......@@ -831,7 +831,7 @@ DEPENDENCIES
rails-assets-jquery-simulate (= 1.0.1)!
rails-assets-jquery-simulate-ext (= 1.3.0)!
rails-assets-jquery-textchange (= 0.2.3)!
rails-assets-markdown-it (= 4.2.1)!
rails-assets-markdown-it (= 4.2.2)!
rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
rails-assets-markdown-it-diaspora-mention (= 0.3.0)!
rails-assets-markdown-it-hashtag (= 0.3.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