[DRE-commits] [ruby-cal-heatmap-rails] 01/03: Merge tag 'upstream/3.6.0+dfsg'

[Praveen Arimbrathodiyil]

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

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

commit e39a7529699646e74ae6011d9e464ae69c1d5f06
Merge: eb0027b 3a34450
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jun 1 13:14:03 2016 +0530

    Merge tag 'upstream/3.6.0+dfsg'
    
    Upstream version 3.6.0+dfsg
    
    # gpg: Signature made Wednesday 01 June 2016 01:13:55 PM 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>"

 README.md                                 |  2 +-
 cal-heatmap-rails.gemspec                 | 36 ++++++++++++++
 lib/cal/heatmap/rails/version.rb          |  2 +-
 metadata.yml                              | 79 -------------------------------
 vendor/assets/javascripts/cal-heatmap.js  | 75 +++++++++++++++++++++++------
 vendor/assets/stylesheets/cal-heatmap.css |  4 +-
 6 files changed, 100 insertions(+), 98 deletions(-)

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