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

Browse Source

# Conflicts:
#	public/js/lehre/anrechnung/approveAnrechnungDetail.js

...

This commit is contained in:

cris-technikum

2021-02-17 19:09:09 +01:00

parent abcf41f7a3 d9d71c42ce

commit b5c9567c01

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