[DRE-commits] [ruby-sass-rails] 01/02: Merge tag 'upstream/5.0.4'

[Praveen Arimbrathodiyil]

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

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

commit eb643b818f1cf1dd265754d6d37e1c566ba2494a
Merge: 4e0654c ff63b24
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jan 12 11:02:28 2016 +0530

    Merge tag 'upstream/5.0.4'
    
    Upstream version 5.0.4
    
    # gpg: Signature made Tuesday 12 January 2016 11:02:24 AM 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>"

 .travis.yml                                                    |  2 +-
 README.md                                                      | 10 +++++-----
 gemfiles/Gemfile-sprockets-3-0                                 |  2 +-
 lib/sass/rails/railtie.rb                                      |  8 +++++---
 lib/sass/rails/version.rb                                      |  2 +-
 sass-rails.gemspec                                             |  2 +-
 .../alternate_config_project/config/environments/test.rb       |  3 +++
 test/sass_rails_test.rb                                        | 10 ++++++++++
 8 files changed, 27 insertions(+), 12 deletions(-)

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