diff options
| author | Michael Elovskikh | 2013-01-28 16:26:16 +0600 |
|---|---|---|
| committer | Michael Elovskikh | 2013-01-28 16:26:16 +0600 |
| commit | 499d6424aee5b71b8e6b2500bf14fa85321bfc26 (patch) | |
| tree | 34f575fb078377208ded5251aea050668355d82a /docs/template.html | |
| parent | 180c94dc44a9cc5b882364a58b0b12a8ab430c22 (diff) | |
| parent | 3bcd38b7d0ddaa2c051ad230cb0d749f9737fd82 (diff) | |
| download | django-rest-framework-499d6424aee5b71b8e6b2500bf14fa85321bfc26.tar.bz2 | |
Merge branch 'upstream_master' into docs_patch_method
Conflicts:
docs/api-guide/authentication.md
Diffstat (limited to 'docs/template.html')
| -rw-r--r-- | docs/template.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/template.html b/docs/template.html index d789cc58..2a87e92b 100644 --- a/docs/template.html +++ b/docs/template.html @@ -89,6 +89,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a> <ul class="dropdown-menu"> + <li><a href="{{ base_url }}/topics/ajax-csrf-cors{{ suffix }}">AJAX, CSRF & CORS</a></li> <li><a href="{{ base_url }}/topics/browser-enhancements{{ suffix }}">Browser enhancements</a></li> <li><a href="{{ base_url }}/topics/browsable-api{{ suffix }}">The Browsable API</a></li> <li><a href="{{ base_url }}/topics/rest-hypermedia-hateoas{{ suffix }}">REST, Hypermedia & HATEOAS</a></li> |