Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung

Browse Source

# Conflicts:
#	application/models/education/Lehrveranstaltung_model.php
#	application/models/organisation/Studienplan_model.php
#	application/models/person/Notiz_model.php
#	application/models/ressource/Mitarbeiter_model.php
#	public/js/components/Stv/Studentenverwaltung.js
#	public/js/components/Stv/Studentenverwaltung/Verband.js
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php

...

This commit is contained in:

ma0048

2025-08-07 11:03:05 +02:00

parent be24190636 4f2499862f

commit 2b7f56622c

435 changed files with 39158 additions and 7196 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

+5659 -11

File diff suppressed because it is too large Load Diff