[Python-modules-commits] [python-slugify] 02/03: Merge tag 'upstream/1.2.4'

[Hugo Lefeuvre]

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

hle pushed a commit to branch master
in repository python-slugify.

commit 3edfba4390b35d306f6d487e64a710bc297ffb2c
Merge: d47aa46 45e052e
Author: Hugo Lefeuvre <hle at debian.org>
Date:   Wed May 24 17:14:03 2017 +0200

    Merge tag 'upstream/1.2.4'
    
    Upstream version 1.2.4

 .gitignore              |  5 +++
 .travis.yml             |  1 +
 CHANGELOG.md            | 11 ++++++
 MANIFEST.in             |  3 --
 README.md => README.rst | 96 ++++++++++++++++++++++++++++++++-----------------
 setup.cfg               |  2 ++
 setup.py                | 39 ++++++--------------
 slugify/__init__.py     |  2 +-
 slugify/slugify.py      | 27 ++++++++------
 test.py                 | 30 ++++++++++++++++
 10 files changed, 140 insertions(+), 76 deletions(-)

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