Merge remote-tracking branch 'origin/master' into feature-61592/AnwesenheitenFinetuning

Browse Source

# Conflicts:
#	public/js/components/Bootstrap/Modal.js
#	system/phrasesupdate.php

...

This commit is contained in:

Johann Hoffmann

2025-08-19 09:43:30 +02:00

parent 0605baf68f 6d7429eb8e

commit 9707258e62

449 changed files with 39789 additions and 7369 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

+5675 -8

File diff suppressed because it is too large Load Diff