Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp

Browse Source

# Conflicts:
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php

...

This commit is contained in:

Johann Hoffmann

2024-07-08 14:42:01 +02:00

parent affbe7821a b56e8c5f9f

commit 66b151dce0

23 changed files with 2200 additions and 54 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

+1803 -2

File diff suppressed because it is too large Load Diff