diff options
| author | Tom Christie | 2015-02-06 14:35:06 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-02-06 14:35:06 +0000 |
| commit | 3dff9a4fe2952cf632ca7f4cd9ecf4221059ca91 (patch) | |
| tree | 0649d42b20b875e97cb551b987644b61e7860e84 /mkdocs.yml | |
| parent | c06a82d0531f4cb290baacee196829c770913eaa (diff) | |
| parent | 1f996128458570a909d13f15c3d739fb12111984 (diff) | |
| download | django-rest-framework-model-serializer-caching.tar.bz2 | |
Resolve merge conflictmodel-serializer-caching
Diffstat (limited to 'mkdocs.yml')
| -rw-r--r-- | mkdocs.yml | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -42,6 +42,7 @@ pages: - ['api-guide/testing.md', 'API Guide', 'Testing'] - ['api-guide/settings.md', 'API Guide', 'Settings'] - ['topics/documenting-your-api.md', 'Topics', 'Documenting your API'] + - ['topics/internationalization.md', 'Topics', 'Internationalization'] - ['topics/ajax-csrf-cors.md', 'Topics', 'AJAX, CSRF & CORS'] - ['topics/browser-enhancements.md', 'Topics',] - ['topics/browsable-api.md', 'Topics', 'The Browsable API'] @@ -49,11 +50,7 @@ pages: - ['topics/third-party-resources.md', 'Topics', 'Third Party Resources'] - ['topics/contributing.md', 'Topics', 'Contributing to REST framework'] - ['topics/project-management.md', 'Topics', 'Project management'] - - ['topics/rest-framework-2-announcement.md', 'Topics', '2.0 Announcement'] - - ['topics/2.2-announcement.md', 'Topics', '2.2 Announcement'] - - ['topics/2.3-announcement.md', 'Topics', '2.3 Announcement'] - - ['topics/2.4-announcement.md', 'Topics', '2.4 Announcement'] - ['topics/3.0-announcement.md', 'Topics', '3.0 Announcement'] + - ['topics/3.1-announcement.md', 'Topics', '3.1 Announcement'] - ['topics/kickstarter-announcement.md', 'Topics', 'Kickstarter Announcement'] - ['topics/release-notes.md', 'Topics', 'Release Notes'] - - ['topics/credits.md', 'Topics', 'Credits'] |