Merge branch 'master' of github.com:torchbox/wagtail

pull/383/head^2
Matt Westcott 2014-07-03 12:36:15 +01:00
commit f28e43f02f
1 zmienionych plików z 1 dodań i 1 usunięć

Wyświetl plik

@ -3,7 +3,7 @@ Welcome to Wagtail's documentation
Wagtail is a modern, flexible CMS, built on Django.
It supports Django 1.6.2+ on Python 2.6, 2.7, 3.3 and 3.4. Django 1.7 support is in progress pending further release candidate testing.
It supports Django 1.6.2+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. Django 1.7 support is in progress pending further release candidate testing.
.. toctree::
:maxdepth: 3