[Python-modules-commits] [django-fsm] 03/06: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository django-fsm.

commit 386a0aa3a01b576fc61287845e1556753e246cb1
Merge: c6aa9f2 a7dc534
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Jun 19 20:50:37 2017 +0200

    merge patched into master

 .gitignore                                         |  8 ++--
 CHANGELOG.rst                                      |  7 ++++
 README.rst                                         | 14 +++----
 debian/.git-dpm                                    |  6 +--
 debian/patches/remove_django_jenkins.patch         | 27 -------------
 debian/patches/series                              |  1 -
 django_fsm/__init__.py                             |  2 +-
 .../management/commands/graph_transitions.py       |  6 +--
 setup.py                                           |  4 +-
 tests/settings.py                                  |  9 +----
 .../tests/test_model_create_with_generic.py        | 44 ++++++++++++++++++++++
 tox.ini                                            | 26 ++++++-------
 12 files changed, 83 insertions(+), 71 deletions(-)

diff --cc debian/.git-dpm
index 31771ef,0000000..41d0c34
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 9b23c32f4778e6ae2d836ba3d7d0833a329e9380
- 9b23c32f4778e6ae2d836ba3d7d0833a329e9380
- db9e9746e83da3f9dff579fecd3b8cb3193066b2
++a7dc534af78976604bdbbe7410d0cf3e2bc2b1e8
++a7dc534af78976604bdbbe7410d0cf3e2bc2b1e8
++a7dc534af78976604bdbbe7410d0cf3e2bc2b1e8
 +a7dc534af78976604bdbbe7410d0cf3e2bc2b1e8
 +django-fsm_2.6.0.orig.tar.gz
 +f0c7e2e22782ee8d727835b92fc7617f9cc0c94e
 +21514
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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