Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite

Browse Source

# Conflicts:
#	application/models/organisation/Studiensemester_model.php
#	system/phrasesupdate.php

...

This commit is contained in:

Cris

2024-11-27 17:44:45 +01:00

parent 3ec748e6fb b2477bb603

commit b549622f50

356 changed files with 36741 additions and 5615 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

+6016 -3

File diff suppressed because it is too large Load Diff