[DRE-commits] [schleuder] 28/52: Merge tag 'upstream/3.0.0_beta17'

[Georg Faerber]

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

georg-alioth-guest pushed a commit to branch master
in repository schleuder.

commit 946a61a2ec40c1837fb07c0a1bc126a624a00f18
Merge: 39d6596 75e0f68
Author: Georg Faerber <georg at riseup.net>
Date:   Thu Jan 12 18:36:03 2017 +0100

    Merge tag 'upstream/3.0.0_beta17'
    
    Upstream version 3.0.0~beta17
    
    # gpg: Signature made Thu 12 Jan 2017 06:36:03 PM CET
    # gpg:                using RSA key E29DD0FBEC9607D963BDAE0D5AD75B414EA41667
    # gpg: Good signature from "Georg Faerber <georg at riseup.net>" [ultimate]
    # Primary key fingerprint: E29D D0FB EC96 07D9 63BD  AE0D 5AD7 5B41 4EA4 1667

 .travis.yml              |  1 +
 CHANGELOG.md             | 11 +++++++++++
 CODE_OF_CONDUCT.md       | 30 ++++++++++++++++++++++++++++++
 Gemfile.lock             | 14 +++++++-------
 README.md                | 16 +++++++++++-----
 bin/schleuder-smtpd.rb   |  5 +++++
 lib/schleuder/version.rb |  2 +-
 spec/factories/lists.rb  |  2 +-
 spec/smtp-daemon.rb      |  5 +++++
 spec/spec_helper.rb      |  6 +++++-
 10 files changed, 77 insertions(+), 15 deletions(-)

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