Skip to content

Merge main into feature #20190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Sep 2, 2025
Merged

Merge main into feature #20190

merged 4 commits into from
Sep 2, 2025

Conversation

arthanson
Copy link
Collaborator

@arthanson arthanson commented Aug 27, 2025 •
edited
Loading

Merge main into feature, Several of the template files had merge conflicts:

	both modified:   netbox/templates/inc/panels/related_objects.html
	both modified:   netbox/utilities/templates/buttons/add.html
	both modified:   netbox/utilities/templatetags/buttons.py

@arthanson arthanson marked this pull request as ready for review August 27, 2025 21:07
@arthanson arthanson requested review from a team and jeremystretch and removed request for a team August 27, 2025 21:07
jeremystretch
jeremystretch requested changes Aug 28, 2025
View reviewed changes
@jeremystretch jeremystretch merged commit a913544 into feature Sep 2, 2025
10 checks passed
@jeremystretch jeremystretch deleted the merge-main branch September 2, 2025 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeremystretch jeremystretch jeremystretch approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@arthanson @jeremystretch