Merge v3.1.7

This commit is contained in:
jeremystretch
2022-02-03 12:55:34 -05:00
56 changed files with 758 additions and 142 deletions

View File

@@ -14,7 +14,11 @@ body:
attributes:
label: NetBox version
description: What version of NetBox are you currently running?
<<<<<<< HEAD
placeholder: v3.1.6
=======
placeholder: v3.1.7
>>>>>>> develop
validations:
required: true
- type: dropdown

View File

@@ -14,7 +14,11 @@ body:
attributes:
label: NetBox version
description: What version of NetBox are you currently running?
<<<<<<< HEAD
placeholder: v3.1.6
=======
placeholder: v3.1.7
>>>>>>> develop
validations:
required: true
- type: dropdown