Fix conflicts #556
Merged
Fix conflicts #556
Commits on Aug 26, 2023
-
Prep v1.4.2 release (nautobot#549)
* Prep v1.4.2 release * Add arg for poetry * Update docs/admin/release_notes/version_1.4.md Co-authored-by: Jeff Kala <48843785+jeffkala@users.noreply.github.com> --------- Co-authored-by: Jeff Kala <48843785+jeffkala@users.noreply.github.com>
-
Merge pull request nautobot#551 from nautobot/develop
Merge 1.4.2 into main
-
Merge pull request nautobot#552 from nautobot/develop
Merge Develop Back into Next
Commits on Aug 28, 2023
-
Revert "Add Option to Update Config Context Repos (nautobot#506)"
This reverts commit 69b34ef.
-
Merge pull request nautobot#553 from itdependsnetworks/revert-commit
Revert "Add Option to Update Config Context Repos (nautobot#506)"
-
* Prep v 1.5.0 release * update black target version
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.