Merge branch 'version-3.1' of github.com:tomchristie/django-rest-framework into oauth_as_package

Conflicts:
	.travis.yml

1 files changed, 1 insertions, 0 deletions

diff --git a/mkdocs.py b/mkdocs.py
index b4c41408..25cb55e2 100755
--- a/mkdocs.py
+++ b/mkdocs.py
@@ -76,6 +76,7 @@ path_list = [
     'topics/browser-enhancements.md',
     'topics/browsable-api.md',
     'topics/rest-hypermedia-hateoas.md',
+    'topics/third-party-resources.md',
     'topics/contributing.md',
     'topics/rest-framework-2-announcement.md',
     'topics/2.2-announcement.md',