MaxBUhe 42618fef79 Merge remote-tracking branch 'remotes/origin/rel_2.x' ... # Conflicts: # Modules/Core/ViewConfig.php		2023-09-13 16:18:43 +02:00
..
ViewConfig.php	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-09-13 16:18:43 +02:00