Commit Graph

3 Commits

Author SHA1 Message Date
Marco Ceppi
88f5430f05 Update startup scripts to update or create records rather than get/create 2020-07-09 14:51:34 -04:00
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
Marco Ceppi
fff05b3154 Always run *some* startup scripts even when disabled 2019-11-21 17:29:08 -05:00