Merge remote-tracking branch 'origin/master'

2e0ce78b · Weblate · e2c27ccf · a1f1edcd · 2e0ce78b
Commit 2e0ce78b authored Jan 10, 2014 by Weblate
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

docs/admin/install.rst docs/admin/install.rst +1 -1

No files found.
--- a/docs/admin/install.rst
+++ b/docs/admin/install.rst
@@ -10,7 +10,7 @@ Requirements

 Python (2.7)
    http://www.python.org/
-Django (>= 1.5)
+Django (>= 1.5) (Django 1.6 is supported since Weblate 1.9)
    https://www.djangoproject.com/
 Translate-toolkit (>= 1.9.0, 1.10.0 or newer strongly recommended)
    http://toolkit.translatehouse.org/