Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU

Browse Source

# Conflicts:
#	system/phrasesupdate.php

...

This commit is contained in:

cris-technikum

2021-02-10 18:31:26 +01:00

parent c0843e9506 3cbb1b5c95

commit 41f8a0e3b3

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