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-06-30 23:30:14 +02:00
commit 6855095e7b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -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.2"
gem "rails-assets-markdown-it", "4.3.0"
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.2"

4
Gemfile.lock
View file

@ -542,7 +542,7 @@ GEM
rails-assets-jquery.slimscroll (1.3.6)
rails-assets-jquery (>= 1.7)
rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
rails-assets-markdown-it (4.2.2)
rails-assets-markdown-it (4.3.0)
rails-assets-markdown-it-diaspora-mention (0.3.0)
rails-assets-markdown-it-hashtag (0.3.1)
rails-assets-markdown-it-sanitizer (0.3.2)
@ -824,7 +824,7 @@ DEPENDENCIES
rails-assets-jquery-idletimer (= 1.0.1)!
rails-assets-jquery-placeholder (= 2.1.1)!
rails-assets-jquery-textchange (= 0.2.3)!
rails-assets-markdown-it (= 4.2.2)!
rails-assets-markdown-it (= 4.3.0)!
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)!