Просмотр исходного кода

Merge branch 'develop-2.8' into 3351-plugins

John Anderson 6 лет назад
Родитель
Сommit
683c5a22db

+ 1 - 1
netbox/extras/migrations/0039_standardize_description.py → netbox/extras/migrations/0040_standardize_description.py

@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('extras', '0038_webhook_template_support'),
+        ('extras', '0039_update_features_content_types'),
     ]
 
     operations = [

+ 1 - 1
netbox/extras/migrations/0040_tag_description.py → netbox/extras/migrations/0041_tag_description.py

@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('extras', '0039_standardize_description'),
+        ('extras', '0040_standardize_description'),
     ]
 
     operations = [