[DRE-commits] [ruby-diaspora-federation-rails] 01/03: Merge tag 'upstream/0.1.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-diaspora-federation-rails.

commit fc5bbd4deb0e4e7cefe3b98eeafd3632ccc4f252
Merge: d742738 b47b5da
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Sep 18 11:47:44 2016 +0530

    Merge tag 'upstream/0.1.4'
    
    Upstream version 0.1.4
    
    # gpg: Signature made Sunday 18 September 2016 11:47:44 AM IST using RSA key ID CE1F9C674512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]

 Changelog.md                                       | 41 ++++++++++++++++++
 README.md                                          | 50 ++++++++--------------
 .../diaspora_federation/application_controller.rb  |  2 +-
 .../diaspora_federation/fetch_controller.rb        |  6 +--
 .../diaspora_federation/h_card_controller.rb       |  6 ++-
 .../diaspora_federation/receive_controller.rb      |  8 ++--
 .../diaspora_federation/webfinger_controller.rb    |  8 ++--
 config/initializers/filter_parameter_logging.rb    |  2 +
 diaspora_federation-rails.gemspec                  | 18 ++++----
 9 files changed, 85 insertions(+), 56 deletions(-)

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