[Python-modules-commits] [python-sparkpost] 02/03: Merge tag 'upstream/1.3.5' into debian/master

[Scott Kitterman]

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

kitterman pushed a commit to branch debian/master
in repository python-sparkpost.

commit 5067101d5fd3409789a4d9fa00a4f581d01018a8
Merge: fca17a6 5e09b1d
Author: Scott Kitterman <scott at kitterman.com>
Date:   Tue Jun 20 15:09:12 2017 -0400

    Merge tag 'upstream/1.3.5' into debian/master
    
    Upstream version 1.3.5

 CHANGELOG.md                               | 18 +++++++++++++++--
 Makefile                                   |  2 +-
 docs/conf.py                               |  2 +-
 examples/base_resource.py                  | 18 +++++++++++++++++
 examples/transmissions/handle_exception.py | 32 ++++++++++++++++++++++++++++++
 setup.py                                   |  2 +-
 sparkpost/__init__.py                      |  2 +-
 sparkpost/django/message.py                |  3 +++
 sparkpost/transmissions.py                 | 18 ++++++++++++++---
 test-requirements.txt                      |  1 +
 test/django/test_message.py                | 11 ++++++++++
 test/test_transmissions.py                 | 30 ++++++++++++++++++++++++++--
 12 files changed, 128 insertions(+), 11 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-sparkpost.git