Merge branch 'stable' into develop

Gemfile

@@ -96,7 +96,7 @@ gem "js-routes",         "1.2.3"
 source "https://rails-assets.org" do
   gem "rails-assets-jquery",                              "1.12.0" # Should be kept in sync with jquery-rails
 
-  gem "rails-assets-markdown-it",                         "5.1.0"
+  gem "rails-assets-markdown-it",                         "6.0.0"
   gem "rails-assets-markdown-it-hashtag",                 "0.4.0"
   gem "rails-assets-markdown-it-diaspora-mention",        "0.4.0"
   gem "rails-assets-markdown-it-sanitizer",               "0.4.1"

Gemfile.lock

@@ -653,7 +653,7 @@ GEM
     rails-assets-jquery.ui (1.11.4)
       rails-assets-jquery (>= 1.6)
     rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
-    rails-assets-markdown-it (5.1.0)
+    rails-assets-markdown-it (6.0.0)
     rails-assets-markdown-it-diaspora-mention (0.4.0)
     rails-assets-markdown-it-hashtag (0.4.0)
     rails-assets-markdown-it-sanitizer (0.4.1)
@@ -990,7 +990,7 @@ DEPENDENCIES
   rails-assets-jquery (= 1.12.0)!
   rails-assets-jquery-placeholder (= 2.3.1)!
   rails-assets-jquery-textchange (= 0.2.3)!
-  rails-assets-markdown-it (= 5.1.0)!
+  rails-assets-markdown-it (= 6.0.0)!
   rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
   rails-assets-markdown-it-diaspora-mention (= 0.4.0)!
   rails-assets-markdown-it-hashtag (= 0.4.0)!