Files
ma0048 b6c2f2c9c9 Merge remote-tracking branch 'origin/master' into demo
# Conflicts:
#	application/models/education/Projektarbeit_model.php
#	application/views/CisRouterView/CisRouterView.php
#	public/css/Cis4/Cis.css
#	public/js/api/factory/studiensemester.js
#	public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
#	public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
#	public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
#	system/phrasesupdate.php
2026-04-01 11:34:28 +02:00
..