fix: resolve merge conflicts of joomla_6 branch

Browse Source

...

This commit is contained in:

Marvin Flock

2025-04-21 22:07:45 +02:00

parent d5eee17e8f c59a0be5ec

commit dbdf7be51a

32 changed files with 50820 additions and 52055 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

src/structure/script.php

+244 -222

File diff suppressed because it is too large Load Diff