[Python-modules-commits] [python-django-contact-form] 02/10: Merge tag 'upstream/1.3'

[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-contact-form.

commit 77c332cc54082d39f526720b52ff684bf0f50441
Merge: 572263c c8a9b1f
Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Date:   Sat Dec 24 14:52:03 2016 -0500

    Merge tag 'upstream/1.3'
    
    Upstream version 1.3

 .gitignore               |   5 ++
 .travis.yml              |  11 +++--
 LICENSE                  |   2 +-
 README.rst               |   4 +-
 contact_form/forms.py    |   5 +-
 contact_form/runtests.py |  29 ++++++++----
 contact_form/views.py    |   5 +-
 docs/conf.py             |   6 +--
 docs/faq.rst             |  56 ++++++++++++++++------
 docs/forms.rst           |  44 ++++++++---------
 docs/index.rst           |  34 ++++++++-----
 docs/install.rst         | 121 +++++++++++++----------------------------------
 docs/quickstart.rst      | 108 ++++++++++++++++++++++++++++++++++++++++++
 docs/views.rst           |  18 ++++++-
 setup.py                 |   3 +-
 15 files changed, 288 insertions(+), 163 deletions(-)

diff --cc .gitignore
index e1a5bd6,955f665..60641c2
--- a/.gitignore
+++ b/.gitignore
@@@ -2,4 -2,5 +2,9 @@@
  __pycache__
  *.egg-info
  docs/_build/
++<<<<<<< HEAD
 +.coverage.pc/
++=======
+ dist/
 -.coverage
++.coverage
++>>>>>>> upstream/1.3

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