Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4

# Conflicts:
#	application/controllers/api/frontend/v1/Lehre.php
#	application/models/education/Lehrveranstaltung_model.php
#	application/models/education/Note_model.php
#	application/views/CisRouterView/CisRouterView.php
#	public/js/api/factory/studiensemester.js
#	public/js/components/Bootstrap/Offcanvas.js
#	public/js/components/Overlay/FhcOverlay.js
This commit is contained in:
Johann Hoffmann
2026-02-04 15:40:34 +01:00
150 changed files with 13827 additions and 2592 deletions
@@ -19,6 +19,4 @@ class Note_model extends DB_Model
return $this->execReadOnlyQuery($qry);
}
}