Marco Ceppi bb7191e953 Merge upstream v2.8.5 into develop ...

# Conflicts:
#	netbox/dcim/api/serializers.py
#	netbox/dcim/models/__init__.py
#	netbox/extras/constants.py
#	netbox/netbox/admin.py
#	netbox/templates/users/base.html
#	requirements.txt

2020-05-27 15:44:47 -04:00

..

git-hooks

Fixed git commit hook

2019-12-06 12:54:13 -05:00

cibuild.sh

Correct path to test configuration file

2020-04-01 13:29:54 -04:00

export-to-initializers

Add initializers to produce a single 6 wedge site with 9U lockers

2019-10-08 11:07:47 -04:00

management-api-to-initializers

Add ability to update initializers based on management-api exports

2019-11-26 11:20:38 -05:00