Merge branch 'master' into fork/boriswa/1849-1848-1920-1921-fix-bugs

# Conflicts: # src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
2026-03-02 03:59:40 +00:00 · 2025-12-12 10:11:31 +01:00
parent b7df78bc55 ba4e445110
commit dae040ebfb
22 changed files with 1037 additions and 955 deletions
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -38,5 +38,4 @@ return [
    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
    Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
    loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
-    Chill\ZimbraBundle\ChillZimbraBundle::class => ['all' => true],
 ];