Merge branch '1.0'

symfony-cmf · Apr 7, 2014 · 5552114 · 5552114
2 parents 424b461 + b5b3182
commit 5552114
Show file tree

Hide file tree

Showing 2 changed files with 265 additions and 142 deletions.
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "authors": [
         {
             "name": "Symfony CMF Community",
-            "homepage": "https://github.com/symfony-cmf/SimpleCmsBundle/contributors"
+            "homepage": "https://github.com/symfony-cmf/symfony-cmf-standard/contributors"
         }
     ],
     "autoload": {
@@ -61,6 +61,7 @@
             "Liip\\FunctionalTestBundle\\LiipFunctionalTestBundle",
             "Sensio\\Bundle\\DistributionBundle\\SensioDistributionBundle",
             "Sonata\\BlockBundle\\SonataBlockBundle",
+            "Sonata\\CoreBundle\\SonataCoreBundle",
             "Symfony\\Cmf\\Bundle\\BlockBundle\\CmfBlockBundle"
         ],
         "symfony-app-dir": "app",