Merge remote-tracking branch 'origin/develop' into develop

Browse Source

# Conflicts:
#	public/views/layout.php

...

This commit is contained in:

blaerf 2025-11-28 23:30:56 +01:00

parent bde7b7c7ce bef54a7553

commit d013b6cb8a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available