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

[Balasankar C]

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

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

commit 83baaffddd46df46cb96f3fec2e1bcff7d738500
Merge: 6f6d9c0 de202d7
Author: Balasankar C <balasankarc at autistici.org>
Date:   Sun Nov 13 16:37:39 2016 +0530

    Merge tag 'upstream/9.7.0'
    
    Upstream version 9.7.0

 .../javascripts/highlightjs/highlight.pack.js      | 220 +++++++++++++--------
 .../stylesheets/highlightjs/atom-one-dark.scss     |   1 +
 .../stylesheets/highlightjs/atom-one-light.scss    |   1 +
 lib/rails-assets-highlightjs/version.rb            |   2 +-
 rails-assets-highlightjs.json                      |   2 +-
 5 files changed, 144 insertions(+), 82 deletions(-)

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