Merge branch 'staging' into api_v2_backgrounds

open5e · Oct 28, 2023 · 14cfb05 · 14cfb05
2 parents 429220e + fb8e03a
commit 14cfb05
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/api_v2/migrations/0001_initial.py b/api_v2/migrations/0001_initial.py
@@ -89,7 +89,7 @@ class Migration(migrations.Migration):
                 ('creature', models.ForeignKey(help_text='The creature to which this action belongs.', on_delete=django.db.models.deletion.CASCADE, to='api_v2.creature')),
             ],
             options={
-                'abstract': False,
+                'verbose_name_plural': 'armor',
             },
         ),
         migrations.CreateModel(

diff --git a/api_v2/models/abstracts.py b/api_v2/models/abstracts.py
@@ -105,7 +105,6 @@ class Meta:
         abstract = True
         ordering = ['pk']
 
-
 class Benefit(HasName, HasDescription):
     """
     This is the definition of a Benefit abstract base class.