mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-24 02:12:17 +00:00
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:
@@ -19,6 +19,4 @@ class Note_model extends DB_Model
|
||||
|
||||
return $this->execReadOnlyQuery($qry);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user