[Python-modules-commits] [djoser] 02/06: Merge tag 'upstream/0.4.0'

[Michael Fladischer]

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

fladi pushed a commit to annotated tag debian/0.4.0-1
in repository djoser.

commit dd2f1bd146626596fb872893477466fed45b3c8f
Merge: ecbd0bd 75bce4e
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Oct 1 18:14:06 2015 +0200

    Merge tag 'upstream/0.4.0'
    
    Upstream version 0.4.0

 PKG-INFO                         | 119 ++++++++++++++++++++++++---------------
 README.md                        |  95 +++++++++++++++++++------------
 djoser.egg-info/PKG-INFO         | 119 ++++++++++++++++++++++++---------------
 djoser.egg-info/SOURCES.txt      |   6 +-
 djoser.egg-info/requires.txt     |   2 +-
 djoser.egg-info/top_level.txt    |   1 +
 djoser/serializers.py            |  86 +++++-----------------------
 djoser/settings.py               |   3 +-
 djoser/urls/__init__.py          |   1 +
 djoser/urls/authtoken.py         |   9 +++
 djoser/{urls.py => urls/base.py} |   9 ++-
 djoser/utils.py                  |   7 ++-
 djoser/views.py                  |  61 +++++++++-----------
 requirements.txt                 |   2 +-
 setup.cfg                        |   4 +-
 setup.py                         |  18 ++++--
 16 files changed, 290 insertions(+), 252 deletions(-)

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