Merge branch 'master' of github.com:tomchristie/django-rest-framework

9ccdc436 · Tom Christie · 9baa1fde · 81887bdc · 9ccdc436 · 9ccdc436
Commit 9ccdc436 authored Mar 10, 2017 by Tom Christie
5 changed files
--- a/rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.eot
+++ b/rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.eot
--- a/rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.svg
+++ b/rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.svg
--- a/rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.ttf
+++ b/rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.ttf
--- a/rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.woff
+++ b/rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.woff
--- a/rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.woff2
+++ b/rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.woff2