Merging v2.0 development into mainline #1145
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ey in an HTTP header
Conflicts: netbox/dcim/forms.py netbox/dcim/views.py netbox/ipam/forms.py netbox/templates/_base.html netbox/utilities/views.py
… web form API call
Conflicts: netbox/circuits/models.py netbox/netbox/settings.py upgrade.sh
Conflicts: netbox/ipam/forms.py
lampwins
pushed a commit
to lampwins/netbox
that referenced
this pull request
Oct 13, 2017
Merging v2.0 development into mainline
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request will merge the
v2-developbranch, which has been used for parallel development of the v2.0 API, into the maindevelopbranch. This is being done in preparation for the v2.0 release later this week.