Merge remote-tracking branch 'origin/feature-30181/Anrechnungen_Erweiterte-Angaben-fuer-Studierende' into feature-30181/Anrechnungen_Erweiterte-Angaben-fuer-Studierende

Browse Source

# Conflicts:
#	system/phrasesupdate.php

...

This commit is contained in:

Cris

2023-08-22 13:42:32 +02:00

parent b5a81b540f 74b1ca0614

commit 057b003977

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

Diff Content Not Available