Merge branch 'master' into 2.4.0

1 files changed, 11 insertions, 0 deletions

diff --git a/rest_framework/authtoken/admin.py b/rest_framework/authtoken/admin.py
new file mode 100644
index 00000000..ec28eb1c
--- /dev/null
+++ b/rest_framework/authtoken/admin.py
@@ -0,0 +1,11 @@
+from django.contrib import admin
+from rest_framework.authtoken.models import Token
+
+
+class TokenAdmin(admin.ModelAdmin):
+    list_display = ('key', 'user', 'created')
+    fields = ('user',)
+    ordering = ('-created',)
+
+
+admin.site.register(Token, TokenAdmin)