Merge branch 'develop' into develop-2.8

This commit is contained in:
Jeremy Stretch
2020-03-03 13:20:00 -05:00
77 changed files with 1331 additions and 565 deletions

View File

@@ -0,0 +1,19 @@
# Generated by Django 2.2.10 on 2020-03-03 16:59
from django.db import migrations, models
import utilities.validators
class Migration(migrations.Migration):
dependencies = [
('dcim', '0098_devicetype_images'),
]
operations = [
migrations.AlterField(
model_name='powerfeed',
name='voltage',
field=models.SmallIntegerField(default=120, validators=[utilities.validators.ExclusionValidator([0])]),
),
]

View File

@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('dcim', '0098_devicetype_images'),
('dcim', '0099_powerfeed_negative_voltage'),
]
operations = [