From 5c32cace645d0a3103a625d40677cbf5537e07d8 Mon Sep 17 00:00:00 2001
From: JuniorJPDJ <git@juniorjpdj.pl>
Date: Fri, 25 Nov 2022 20:03:37 +0100
Subject: [PATCH] fix(api): merge migrations after merging stable to develop

---
 .../users/migrations/0023_merge_20221125_1902.py   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 api/funkwhale_api/users/migrations/0023_merge_20221125_1902.py

diff --git a/api/funkwhale_api/users/migrations/0023_merge_20221125_1902.py b/api/funkwhale_api/users/migrations/0023_merge_20221125_1902.py
new file mode 100644
index 000000000..7dca07259
--- /dev/null
+++ b/api/funkwhale_api/users/migrations/0023_merge_20221125_1902.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.16 on 2022-11-25 19:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0022_alter_user_settings'),
+        ('users', '0022_auto_20221119_1819'),
+    ]
+
+    operations = [
+    ]