diff options
| author | Tom Christie | 2012-04-11 15:28:57 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-04-11 15:28:57 +0100 |
| commit | 44df8345f3ffcba141ded3a1bd993971d7199164 (patch) | |
| tree | d102b9c5faf06f599e8975a3b4346907568dd600 /docs | |
| parent | 44b5d6120341c5fb90a0b3022d09f9ad78d9f836 (diff) | |
| parent | e53c819cc7a5567f2c29375550e9ff62ec20d472 (diff) | |
| download | django-rest-framework-44df8345f3ffcba141ded3a1bd993971d7199164.tar.bz2 | |
Merge with master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/howto/setup.rst | 1 | ||||
| -rw-r--r-- | docs/requirements.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/howto/setup.rst b/docs/howto/setup.rst index 081c6412..f0127060 100644 --- a/docs/howto/setup.rst +++ b/docs/howto/setup.rst @@ -49,6 +49,7 @@ YAML YAML support is optional, and requires `PyYAML`_. + Login / Logout -------------- diff --git a/docs/requirements.txt b/docs/requirements.txt index 77cdf485..46a67149 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ # Documentation requires Django & Sphinx, and their dependencies... -Django==1.2.4 +Django>=1.2.4 Jinja2==2.5.5 Pygments==1.4 Sphinx==1.0.7 |