Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
stephenmcd committed Aug 20, 2015
2 parents 2169f08 + 2b55a19 commit bdc85e0
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ standard Django environment), with the following dependencies:

* `Python`_ 2.7 to 3.3
* `Django`_ 1.7 to 1.8
* `django-contrib-comments`_ - for built-in threaded comments
* `Pillow`_ - for image resizing (`Python Imaging Library`_ fork)
* `grappelli-safe`_ - admin skin (`Grappelli`_ fork)
* `filebrowser-safe`_ - for managing file uploads (`FileBrowser`_ fork)
Expand Down Expand Up @@ -635,6 +636,7 @@ Quotes
.. _`Django`: http://djangoproject.com/
.. _`Django Code of Conduct`: https://www.djangoproject.com/conduct/
.. _`django-contrib-comments`: https://pypi.python.org/pypi/django-contrib-comments
.. _`BSD licensed`: http://www.linfo.org/bsdlicense.html
.. _`Wordpress`: http://wordpress.org/
.. _`great sites people have built using Mezzanine`: http://mezzanine.jupo.org/sites/
Expand Down

0 comments on commit bdc85e0

Please sign in to comment.