Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge migration heads
Roland Geider4d94500c80f8
diff --git a/wger/core/migrations/0014_merge_20210818_1735.py b/wger/core/migrations/0014_merge_20210818_1735.pynew file mode 100644index 000000000..7d7ef9af7--- /dev/null+++ b/wger/core/migrations/0014_merge_20210818_1735.py@@ -0,0 +1,14 @@+# Generated by Django 3.2.3 on 2021-08-18 15:35++from django.db import migrations+++class Migration(migrations.Migration):++ dependencies = [+ ('core', '0013_auto_20210726_1729'),+ ('core', '0013_userprofile_email_verified'),+ ]++ operations = [+ ]