Merge remote-tracking branch 'remotes/origin/rel_1.x'

Browse Source

# Conflicts:
#	Application/views/admin/de/module_options.php
#	Application/views/ga4/view_item_list.tpl
#	CHANGELOG.md
#	Modules/Core/ViewConfig.php
#	composer.json
#	metadata.php

...

This commit is contained in:

MaxBUhe 2023-06-27 10:03:51 +02:00

parent 4f8fa7cdc9 432ba54c84

commit 461f7f15da

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