[DRE-commits] [ruby-jquery-rails] 02/05: Merge tag 'upstream/3.1.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-jquery-rails.

commit fba38653f9766f2fab5d1d82fcac3bd2414e18ad
Merge: 587d449 7b4a408
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun May 4 13:37:28 2014 +0530

    Merge tag 'upstream/3.1.0'
    
    Upstream version 3.1.0

 .gitignore                                         |     3 +-
 CHANGELOG.md                                       |    84 +
 CONTRIBUTING.md                                    |    36 +
 Gemfile                                            |     2 +-
 Gemfile.lock                                       |    62 -
 README.md                                          |    83 +-
 Rakefile                                           |    52 +-
 VERSIONS.md                                        |    43 +
 jquery-rails.gemspec                               |     5 +-
 lib/generators/jquery/install/install_generator.rb |    11 +-
 lib/jquery/rails.rb                                |     4 +-
 lib/jquery/rails/engine.rb                         |     2 -
 lib/jquery/rails/railtie.rb                        |    18 +
 lib/jquery/rails/version.rb                        |     7 +-
 metadata.yml                                       |    31 +-
 spec/lib/jquery-rails_spec.rb                      |     3 -
 spec/spec_helper.rb                                |    29 -
 vendor/assets/javascripts/jquery-ui.js             | 11802 ---------------
 vendor/assets/javascripts/jquery-ui.min.js         |    15 -
 vendor/assets/javascripts/jquery.js                | 14251 ++++++++++---------
 vendor/assets/javascripts/jquery.min.js            |     8 +-
 vendor/assets/javascripts/jquery.min.map           |     1 +
 vendor/assets/javascripts/jquery_ujs.js            |   281 +-
 23 files changed, 8064 insertions(+), 18769 deletions(-)

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