Browse files

Merge.

  • Loading branch information...
2 parents 14e6561 + e58dc3d commit 6511bb6bdd8678f57b849bf50e13f5b374e8bc76 @stephenmcd committed May 12, 2012
Showing with 5 additions and 1 deletion.
  1. +3 −0 README.rst
  2. +2 −1 mezzanine/core/templates/includes/pagination.html
View
3 README.rst
@@ -163,6 +163,7 @@ listed here, send an email to the `mezzanine-users`_ mailing list.
* `mezzanine-mdown`_ - Adds `Markdown`_ support to Mezzanine's rich text editor.
* `mezzanine-openshift`_ Setup for running Mezzanine on `Redhat's OpenShift`_ cloud platform.
* `mezzanine-stackato`_ Setup for running Mezzanine on `ActiveState's Stackato`_ cloud platform.
+ * `mezzanine-blocks`_ Mezzanine + django-flatblocks.
Donating
========
@@ -310,6 +311,8 @@ Quotes
.. _`Redhat's OpenShift`: https://openshift.redhat.com/
.. _`mezzanine-stackato`: https://github.com/ActiveState/mezzanine-stackato
.. _`ActiveState's Stackato`: http://www.activestate.com/stackato
+.. _`mezzanine-blocks`: https://github.com/renyi/mezzanine-blocks
+
.. PEOPLE WITH QUOTES
View
3 mezzanine/core/templates/includes/pagination.html
@@ -1,5 +1,6 @@
{% load i18n %}
+{% if current_page.has_previous or current_page.has_next %}
<div class="pagination">
<ul>
@@ -20,4 +21,4 @@
</ul>
</div>
-
+{% endif %}

0 comments on commit 6511bb6

Please sign in to comment.