Merge branch '6.1' into shared-templates
authorCyperghost <olaf_schmitz_1@t-online.de>
Mon, 26 Feb 2024 13:01:16 +0000 (14:01 +0100)
committerCyperghost <olaf_schmitz_1@t-online.de>
Mon, 26 Feb 2024 13:01:16 +0000 (14:01 +0100)
commit8d7a673b8ec53795b2a7d03610e48906a26768b7
tree330c2f40212fee7d8d1943b2c0a8f1fdd5a84204
parent77deffdfc1608b60b4c06b6cedae03ffeb0de72a
parentff4e488d2836d2166c805b476f4fd6f15365522e
Merge branch '6.1' into shared-templates

# Conflicts:
# mkdocs.yml
mkdocs.yml