[DRE-commits] [tdiary-contrib] 02/04: Merge tag 'upstream/5.0.4'

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository tdiary-contrib.

commit bd212f514c0eb9ee0f5b6de61779331364d3c6fc
Merge: 5214964 11ca0ab
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun May 14 20:17:37 2017 +0900

    Merge tag 'upstream/5.0.4'
    
    Upstream version 5.0.4

 .gitignore                    |   2 -
 .travis.yml                   |   4 +-
 Gemfile.lock                  |  50 +++++---
 js/picasa.js                  | 268 ------------------------------------------
 lib/tdiary/contrib/version.rb |   2 +-
 plugin/flickr.rb              |   2 +-
 plugin/google_analytics.rb    |  36 +++++-
 plugin/ogp.rb                 |  41 +++++--
 plugin/picasa.rb              |  34 ------
 plugin/playstore.rb           |   2 +-
 spec/flicker_spec.rb          |   2 +-
 11 files changed, 104 insertions(+), 339 deletions(-)

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