starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-23 01:08:45 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop-2.10' into 4878-custom-fields

Browse Source
This commit is contained in:
Jeremy Stretch
2020-09-04 16:14:06 -04:00
parent 53e09a924c 08c492f1f4
commit c5ab89d71e
47 changed files with 465 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
netbox/dcim/migrations/0115_rackreservation_order.py Normal file
View File

@@ -0,0 +1,17 @@
# Generated by Django 3.1 on 2020-08-24 16:03
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('dcim', '0114_update_jsonfield'),
]
operations = [
migrations.AlterModelOptions(
name='rackreservation',
options={'ordering': ['created', 'pk']},
),
]

2
netbox/dcim/migrations/0115_custom_field_data.py → netbox/dcim/migrations/0116_custom_field_data.py
View File

@@ -5,7 +5,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('dcim', '0114_update_jsonfield'),
('dcim', '0115_rackreservation_order'),
]
operations = [