MaxBUhe b8e2aeaa58 Merge remote-tracking branch 'remotes/origin/rel_1.x' ... # Conflicts: # Application/views/admin/de/module_options.php # Application/views/ga4/view_item_list.tpl # CHANGELOG.md # Modules/Core/ViewConfig.php # metadata.php		2023-05-31 14:51:07 +02:00
..
views	Merge remote-tracking branch 'remotes/origin/rel_1.x'	2023-05-31 14:51:07 +02:00