Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4

# Conflicts:
#	application/views/CisRouterView/CisRouterView.php
This commit is contained in:
Johann Hoffmann
2026-02-27 10:38:24 +01:00
51 changed files with 2505 additions and 690 deletions
@@ -40,6 +40,7 @@ $includesArray = array(
'vendor/npm-asset/primevue/divider/divider.min.js',
'vendor/npm-asset/primevue/password/password.js',
'vendor/npm-asset/primevue/multiselect/multiselect.js',
'vendor/npm-asset/primevue/tieredmenu/tieredmenu.js',
'vendor/moment/luxonjs/luxon.min.js'
),
'customJSModules' => array(