Merge remote-tracking branch 'origin/master' into demo

Browse Source

# 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

...

This commit is contained in:

ma0048

2026-04-01 11:34:28 +02:00

parent a94366d5a8 c2ce831bca

commit b6c2f2c9c9

262 changed files with 20832 additions and 5049 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

system/phrasesupdate.php

+3929 -52

File diff suppressed because it is too large Load Diff