[DRE-commits] [ruby-entypo-rails] 01/06: Merge tag 'upstream/3.0.0_pre_rc2'

[Sruthi Chandran]

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

srud-guest pushed a commit to branch master
in repository ruby-entypo-rails.

commit 795d9cb927680a09fff32beee9a718d100d93f72
Merge: 911319f e1e5f26
Author: Sruthi Chandran <srud at disroot.org>
Date:   Fri Aug 26 21:50:01 2016 +0530

    Merge tag 'upstream/3.0.0_pre_rc2'
    
    Upstream version 3.0.0~pre~rc2

 README.md                                          | 18 ++++-
 .../{entypo-fonts.css.scss => entypo-fonts.scss}   |  0
 .../{entypo.css.scss.erb => entypo.scss.erb}       |  1 +
 entypo-rails.gemspec                               |  2 +-
 lib/entypo-rails.rb                                |  3 +
 lib/entypo/charmap.rb                              |  4 +-
 lib/entypo/version.rb                              |  2 +-
 metadata.yml                                       | 87 ----------------------
 8 files changed, 22 insertions(+), 95 deletions(-)

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