diff options
| author | John Anderson <sontek@gmail.com> | 2015-04-13 11:03:48 -0400 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-04-13 11:03:48 -0400 |
| commit | 17279b4da22af5caf23d402b29cef0f729408474 (patch) | |
| tree | 786a5290b1440dea4cc33043cb0715113e0c0451 /README.rst | |
| parent | 50a8a077f403b89ff43ad745f101213c2cfeea8f (diff) | |
| parent | 46805450633291682f97e87055313fc3be477326 (diff) | |
| download | pyramid-17279b4da22af5caf23d402b29cef0f729408474.tar.gz pyramid-17279b4da22af5caf23d402b29cef0f729408474.tar.bz2 pyramid-17279b4da22af5caf23d402b29cef0f729408474.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid into start_pep8
Conflicts:
pyramid/view.py
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/README.rst b/README.rst index adf7eea5e..6de42ea40 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,11 @@ Pyramid .. image:: https://readthedocs.org/projects/pyramid/badge/?version=master :target: http://docs.pylonsproject.org/projects/pyramid/en/master/ - :alt: Documentation Status + :alt: Master Documentation Status + +.. image:: https://readthedocs.org/projects/pyramid/badge/?version=latest + :target: http://docs.pylonsproject.org/projects/pyramid/en/latest/ + :alt: Latest Documentation Status Pyramid is a small, fast, down-to-earth, open source Python web framework. It makes real-world web application development and |