[DRE-commits] [ruby-rails-assets-jquery.slimscroll] 03/12: Merge tag 'upstream/1.3.6+dfsg'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to annotated tag debian/1.3.6+dfsg-1
in repository ruby-rails-assets-jquery.slimscroll.

commit fd6158c9acfd880a16e6bd74df6d0c24a15554a4
Merge: 83ff262 3ad76da
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Sep 16 21:10:56 2015 +0530

    Merge tag 'upstream/1.3.6+dfsg'
    
    Upstream version 1.3.6+dfsg
    
    # gpg: Signature made Wednesday 16 September 2015 09:10:51 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 README.md                                                  |  7 ++++---
 .../documents/jquery.slimscroll/slimScroll.jquery.json     |  4 ++--
 .../javascripts/jquery.slimscroll/jquery.slimscroll.js     | 14 +++++++-------
 app/assets/javascripts/jquery.slimscroll/package.js        | 13 +++++++++++++
 lib/rails-assets-jquery.slimscroll.rb                      |  2 +-
 lib/rails-assets-jquery.slimscroll/version.rb              |  2 +-
 metadata.yml                                               |  7 ++++---
 rails-assets-jquery.slimscroll.gemspec                     |  2 +-
 8 files changed, 33 insertions(+), 18 deletions(-)

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