Merge branch 'master' into feature/Anrechnungen_NEU

Browse Source

# Conflicts:
#	application/libraries/AnrechnungLib.php
#	application/views/lehre/anrechnung/requestAnrechnung.php
#	system/dbupdate_3.3.php
#	system/phrasesupdate.php

...

This commit is contained in:

cris-technikum

2021-01-21 14:06:03 +01:00

parent 0528ae3eb9 c0952af290

commit 2359592032

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