[DRE-commits] [ruby-jquery-rails] 01/09: Merge tag 'upstream/4.2.1'

[Praveen Arimbrathodiyil]

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

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

commit 1e3560f53a8dcc1f652704bd5e6486c3ad886d5d
Merge: c5117db 78c5a25
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Nov 3 22:43:13 2016 +0530

    Merge tag 'upstream/4.2.1'
    
    Upstream version 4.2.1
    
    # gpg: Signature made Thursday 03 November 2016 10:43:12 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]

 .travis.yml                                        |   10 +-
 CHANGELOG.md                                       |   26 +
 CONTRIBUTING.md                                    |  110 +-
 LICENSE => MIT-LICENSE                             |    2 +-
 README.md                                          |   21 +-
 Rakefile                                           |    8 +-
 VERSIONS.md                                        |    4 +
 jquery-rails.gemspec                               |    4 +-
 lib/jquery/rails/version.rb                        |    9 +-
 metadata.yml                                       |  118 -
 vendor/assets/javascripts/jquery.js                | 4593 ++++++++------
 vendor/assets/javascripts/jquery.min.js            |   10 +-
 vendor/assets/javascripts/jquery.min.map           |    2 +-
 vendor/assets/javascripts/jquery2.js               | 4528 ++++++++------
 vendor/assets/javascripts/jquery2.min.js           |    8 +-
 vendor/assets/javascripts/jquery2.min.map          |    2 +-
 .../assets/javascripts/{jquery2.js => jquery3.js}  | 6528 +++++++++++---------
 vendor/assets/javascripts/jquery3.min.js           |    4 +
 vendor/assets/javascripts/jquery3.min.map          |    1 +
 vendor/assets/javascripts/jquery_ujs.js            |  141 +-
 20 files changed, 9166 insertions(+), 6963 deletions(-)

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