Merge main into feature #1381

New Issue

MrUnknownDE · 2026-04-06T00:26:29+02:00

MrUnknownDE commented

2026-04-06 00:26:29 +02:00

Originally created by @arthanson on 8/27/2025

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

*Originally created by @arthanson on 8/27/2025* 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 ```

MrUnknownDE closed this issue

2026-04-06 00:26:29 +02:00

Sign in to join this conversation.

Branches Tags

main

21455-sql-indexes-audit

21357-register-model-actions

feature

20924-plugin-ui-components

21766-improve-test-coverage-for-sortable-table-columns

21157-export-template-public-models

21025-pre-render-config-contexts

21364-swagger

feature-ip-prefix-link

20911-dropdown-3

fix_module_substitution

21160-filterset

20911-dropdown-2

20044-elevation-stuck-lightmode

7604-filter-modifiers-v3

20660-script-load

19724-graphql

14884-script

19720-macaddress-interface-generic-relation

fix-19669-api-image-download

7604-filter-modifiers

19275-fixes-interface-bulk-edit

fix-17794-get_field_value_return_list

11507-show-aggregate-and-rir-on-api

9583-add_column_specific_search_field_to_tables

No Label

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github/netbox#1381