[DRE-commits] [ruby-diaspora-federation-rails] 01/03: Merge tag 'upstream/0.1.7'

[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-diaspora-federation-rails.

commit a7538bb70112eb8249298c78808a52cf5599adf4
Merge: cfa0898 c083f45
Author: Sruthi Chandran <srud at disroot.org>
Date:   Mon Jan 16 22:57:45 2017 +0530

    Merge tag 'upstream/0.1.7'
    
    Upstream version 0.1.7
    
    # gpg: Signature made Mon 16 Jan 2017 10:57:34 PM IST
    # gpg:                using RSA key B1C94F67189FFAC02648FBF3D4DEB22FC0B96E15
    # gpg: Good signature from "Sruthi Chandran <srud at openmailbox.org>" [unknown]
    # gpg:                 aka "Srud <angelsrud at gmail.com>" [unknown]
    # gpg:                 aka "Srud <srud at openmailbox.org>" [unknown]
    # gpg:                 aka "Sruthi Chandran <srud at disroot.org>" [unknown]
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: F889 1B55 2BAD DE5D 0936  8B47 C9B0 AC74 C72B 5836
    #      Subkey fingerprint: B1C9 4F67 189F FAC0 2648  FBF3 D4DE B22F C0B9 6E15

 Changelog.md                                       | 37 ++++++++++++++++++++++
 README.md                                          |  2 +-
 .../diaspora_federation/fetch_controller.rb        |  2 +-
 .../diaspora_federation/h_card_controller.rb       |  2 +-
 .../diaspora_federation/receive_controller.rb      |  6 ++--
 .../diaspora_federation/webfinger_controller.rb    |  2 +-
 diaspora_federation-rails.gemspec                  | 16 +++++-----
 7 files changed, 52 insertions(+), 15 deletions(-)

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