[DRE-commits] [ruby-rails-assets-highlightjs] 01/02: Merge tag 'upstream/9.6.0'

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-rails-assets-highlightjs.

commit 4273786e053a81983021619d68bf36bdd08160e9
Merge: aa5f4a9 f51f957
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Sep 23 15:25:38 2016 +0530

    Merge tag 'upstream/9.6.0'
    
    Upstream version 9.6.0
    
    # gpg: Signature made Friday 23 September 2016 03:25:37 PM IST using RSA key ID CE1F9C674512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]

 Rakefile                                           |    2 +-
 .../javascripts/highlightjs/highlight.pack.js      | 6034 +++++++++++---------
 .../stylesheets/highlightjs/atom-one-dark.scss     |   95 +
 .../stylesheets/highlightjs/atom-one-light.scss    |   95 +
 .../highlightjs/{darkula.scss => darcula.scss}     |    7 +-
 app/assets/stylesheets/highlightjs/darkula.scss    |   74 +-
 app/assets/stylesheets/highlightjs/default.scss    |   60 +-
 app/assets/stylesheets/highlightjs/dracula.scss    |   76 +
 .../stylesheets/highlightjs/gruvbox-dark.scss      |  108 +
 .../stylesheets/highlightjs/gruvbox-light.scss     |  108 +
 app/assets/stylesheets/highlightjs/ocean.scss      |   74 +
 app/assets/stylesheets/highlightjs/purebasic.scss  |   96 +
 .../{darkula.scss => qtcreator_dark.scss}          |   59 +-
 .../{darkula.scss => qtcreator_light.scss}         |   61 +-
 app/assets/stylesheets/highlightjs/xt256.scss      |   92 +
 lib/rails-assets-highlightjs/version.rb            |    2 +-
 metadata.yml                                       |  179 -
 rails-assets-highlightjs.json                      |    2 +-
 18 files changed, 4348 insertions(+), 2876 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rails-assets-highlightjs.git