[Python-modules-commits] [python-django-contact-form] 02/08: Merge branch 'upstream'

Fri Dec 25 19:20:35 UTC 2015

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

asb pushed a commit to branch master
in repository python-django-contact-form.

commit b251aa829fcab2918e919c45764efe7575735e14
Merge: a38a6d1 023166e
Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Date:   Fri Dec 25 13:34:35 2015 -0500

    Merge branch 'upstream'

 LICENSE                          |  2 +-
 README.rst                       |  3 +++
 contact_form/forms.py            | 14 +++++++-------
 contact_form/runtests.py         |  7 ++++++-
 contact_form/tests/test_forms.py |  3 +--
 contact_form/tests/test_views.py |  6 +++---
 contact_form/views.py            | 20 ++++++++++++++++++++
 docs/conf.py                     |  4 ++--
 docs/faq.rst                     | 10 ++++------
 docs/install.rst                 | 11 +++--------
 setup.cfg                        | 16 ++++++++++++----
 setup.py                         |  5 +++--
 12 files changed, 65 insertions(+), 36 deletions(-)

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