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-11-22 15:50:13 +01:00
commit c109a6f6b0
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Gemfile
View file

@ -96,14 +96,14 @@ gem "js-routes", "1.1.2"
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", "5.0.0"
gem "rails-assets-markdown-it", "5.0.2"
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.0"
gem "rails-assets-markdown-it-sanitizer", "0.4.1"
gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
gem "rails-assets-markdown-it-sub", "1.0.0"
gem "rails-assets-markdown-it-sup", "1.0.0"
gem "rails-assets-highlightjs", "8.8.0"
gem "rails-assets-highlightjs", "8.9.1"
gem "rails-assets-typeahead.js", "0.11.1"
# jQuery plugins

12
Gemfile.lock
View file

@ -568,7 +568,7 @@ GEM
rails-assets-jquery.slimscroll (= 1.3.6)
rails-assets-jquery.ui (= 1.11.4)
rails-assets-favico.js (0.3.9)
rails-assets-highlightjs (8.8.0)
rails-assets-highlightjs (8.9.1)
rails-assets-jakobmattsson--jquery-elastic (1.6.11)
rails-assets-jquery (>= 1.2.6)
rails-assets-jasmine (2.3.4)
@ -589,10 +589,10 @@ 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.0.0)
rails-assets-markdown-it (5.0.2)
rails-assets-markdown-it-diaspora-mention (0.4.0)
rails-assets-markdown-it-hashtag (0.4.0)
rails-assets-markdown-it-sanitizer (0.4.0)
rails-assets-markdown-it-sanitizer (0.4.1)
rails-assets-markdown-it-sub (1.0.0)
rails-assets-markdown-it-sup (1.0.0)
rails-assets-perfect-scrollbar (0.6.7)
@ -885,18 +885,18 @@ DEPENDENCIES
rails-assets-autosize (= 3.0.13)!
rails-assets-blueimp-gallery (= 2.16.0)!
rails-assets-diaspora_jsxc (~> 0.1.4.develop)!
rails-assets-highlightjs (= 8.8.0)!
rails-assets-highlightjs (= 8.9.1)!
rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
rails-assets-jasmine-ajax (= 3.2.0)!
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
rails-assets-jquery (= 1.11.2)!
rails-assets-jquery-placeholder (= 2.1.3)!
rails-assets-jquery-textchange (= 0.2.3)!
rails-assets-markdown-it (= 5.0.0)!
rails-assets-markdown-it (= 5.0.2)!
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)!
rails-assets-markdown-it-sanitizer (= 0.4.0)!
rails-assets-markdown-it-sanitizer (= 0.4.1)!
rails-assets-markdown-it-sub (= 1.0.0)!
rails-assets-markdown-it-sup (= 1.0.0)!
rails-assets-perfect-scrollbar (= 0.6.7)!