[DRE-commits] [ruby-gettext-i18n-rails] 01/03: Merge tag 'upstream/1.3.1'

[Sebastien Badia]

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

sbadia-guest pushed a commit to branch master
in repository ruby-gettext-i18n-rails.

commit f03f3bdc6ad333a9a0355dd8f57d90e3ec208ea5
Merge: 25a41d7 a290ab7
Author: Sebastien Badia <seb at sebian.fr>
Date:   Thu Nov 26 01:57:49 2015 +0100

    Merge tag 'upstream/1.3.1'
    
    Upstream version 1.3.1

 Gemfile.lock                                     |  2 +-
 Readme.md                                        |  1 +
 lib/gettext_i18n_rails/base_parser.rb            |  2 +-
 lib/gettext_i18n_rails/ruby_gettext_extractor.rb | 14 ++++++--------
 lib/gettext_i18n_rails/version.rb                |  2 +-
 spec/gettext_i18n_rails/haml_parser_spec.rb      | 14 ++++++++++----
 spec/gettext_i18n_rails/slim_parser_spec.rb      |  6 +++---
 7 files changed, 23 insertions(+), 18 deletions(-)

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