MaxBUhe f02c40cfb7 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 # Docs/README.md # IntelliSenseHelper.php # Modules/Core/ViewConfig.php # metadata.php		2023-09-13 16:13:03 +02:00
..
Application	extend Manufacturer	2023-08-23 17:12:18 +02:00
Core	Merge remote-tracking branch 'remotes/origin/rel_1.x'	2023-09-13 16:13:03 +02:00