From 995188f8c5bfdd0da29a7f9ca01898dfce5f0b37 Mon Sep 17 00:00:00 2001
From: Hugo Rodger-Brown <hugorodgerbrown@users.noreply.github.com>
Date: Mon, 28 Sep 2020 16:16:18 +0100
Subject: [PATCH 1/2] Add missing TokenProxy migration (#7557)

Fixes #7554
---
 .../authtoken/migrations/0003_tokenproxy.py   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 rest_framework/authtoken/migrations/0003_tokenproxy.py

diff --git a/rest_framework/authtoken/migrations/0003_tokenproxy.py b/rest_framework/authtoken/migrations/0003_tokenproxy.py
new file mode 100644
index 000000000..79405a7c0
--- /dev/null
+++ b/rest_framework/authtoken/migrations/0003_tokenproxy.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.1.1 on 2020-09-28 09:34
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authtoken', '0002_auto_20160226_1747'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TokenProxy',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'token',
+                'proxy': True,
+                'indexes': [],
+                'constraints': [],
+            },
+            bases=('authtoken.token',),
+        ),
+    ]

From 05b3865838bcc0e4298a2c6a75cca69aad4f51d7 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 28 Sep 2020 16:18:23 +0100
Subject: [PATCH 2/2] Version 3.12.1

---
 docs/community/release-notes.md | 6 ++++++
 rest_framework/__init__.py      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md
index b9bccc3ac..a300162aa 100644
--- a/docs/community/release-notes.md
+++ b/docs/community/release-notes.md
@@ -36,6 +36,12 @@ You can determine your currently installed version using `pip show`:
 
 ## 3.11.x series
 
+### 3.12.1
+
+Date: 28th September 2020
+
+* Add `TokenProxy` migration. [#7557]
+
 ### 3.12.0
 
 Date: 28th September 2020
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index afb2d3429..cd35f7a04 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -8,7 +8,7 @@ ______ _____ _____ _____    __
 """
 
 __title__ = 'Django REST framework'
-__version__ = '3.12.0'
+__version__ = '3.12.1'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 3-Clause'
 __copyright__ = 'Copyright 2011-2019 Encode OSS Ltd'