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

[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 a2adc76526e906b6af5b88d066a7eaf04beb6839
Merge: c5c938b 78df05e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jun 29 11:21:18 2016 +0530

    Merge tag 'upstream/0.0.13'
    
    Upstream version 0.0.13

 .../diaspora_federation/fetch_controller.rb        | 36 ++++++++++++++++++
 .../diaspora_federation/receive_controller.rb      | 43 +++++++++++++++++-----
 .../diaspora_federation/webfinger_controller.rb    |  8 ++--
 config/routes.rb                                   |  4 ++
 diaspora_federation-rails.gemspec                  | 37 +++++++++++++++++++
 5 files changed, 115 insertions(+), 13 deletions(-)


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