Merge remote-tracking branch 'origin/master' into rector/rules-symfony

# Conflicts:
#	src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
#	src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
This commit is contained in:
2023-09-12 15:21:15 +02:00
57 changed files with 1011 additions and 178 deletions

View File

@@ -49,7 +49,7 @@ class ChillMainConfiguration implements ConfigurationInterface
->end() // end of widgets
->end() // end of root/children
->end() // end of root
;
;
return $treeBuilder;
}