Merge branch 'master' into feature-68298/Tempus_Grundstruktur

Browse Source

# Conflicts:
#	public/js/components/Calendar/Base/DragAndDrop.js
#	public/js/components/Calendar/Base/Grid/Line.js
#	public/js/composables/EventLoader.js

...

This commit is contained in:

ma0048

2026-07-15 15:48:44 +02:00

parent 81c16a3bf2 a139cc8d2e

commit 9abaf30ed3

228 changed files with 22498 additions and 5477 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

+3351 -268

File diff suppressed because it is too large Load Diff