Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung

Browse Source

# Conflicts:
#	system/phrasesupdate.php

...

This commit is contained in:

Cris

2024-09-04 14:47:20 +02:00

parent e4fc0660f8 fda03b88df

commit 06ed2e23aa

115 changed files with 21649 additions and 300 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

+3389 -166

File diff suppressed because it is too large Load Diff