[Python-modules-commits] [python-django-debug-toolbar] 04/07: Merge tag 'upstream/1.6'

[Andrew Starr-Bochicchio]

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

asb pushed a commit to branch master
in repository python-django-debug-toolbar.

commit a8f1f40cb6d85e5c563e639706abcc4dd5fe4b03
Merge: 76751f9 e3e16ca
Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Date:   Sun Nov 27 10:23:30 2016 -0500

    Merge tag 'upstream/1.6'
    
    Upstream version 1.6

 .coveragerc                                        |   6 +
 .travis.yml                                        |  39 +-
 CONTRIBUTING.md                                    |   7 +
 MANIFEST.in                                        |   1 +
 Makefile                                           |   4 +-
 README.rst                                         |  25 +-
 debug_toolbar/apps.py                              |  65 +++-
 debug_toolbar/locale/ru/LC_MESSAGES/django.mo      | Bin 9925 -> 11667 bytes
 debug_toolbar/locale/ru/LC_MESSAGES/django.po      | 395 +++++++++++----------
 debug_toolbar/middleware.py                        |  17 +-
 debug_toolbar/panels/versions.py                   |   9 +-
 debug_toolbar/settings.py                          |  86 -----
 debug_toolbar/static/debug_toolbar/js/toolbar.js   |   4 +-
 .../templates/debug_toolbar/panels/versions.html   |   6 +-
 docs/changes.rst                                   |  19 +
 docs/conf.py                                       |   4 +-
 docs/configuration.rst                             |   7 -
 docs/contributing.rst                              |  14 +-
 docs/installation.rst                              |  81 +----
 example/settings.py                                |  22 +-
 example/urls.py                                    |   7 +
 setup.py                                           |   5 +-
 tests/middleware.py                                |   7 +
 tests/settings.py                                  |  10 +-
 tests/test_integration.py                          |  69 ++++
 tox.ini                                            |  42 ++-
 26 files changed, 533 insertions(+), 418 deletions(-)

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