Skip to content

Commit

Permalink
Merge pull request #255 from symfony-cmf/prepare-rc
Browse files Browse the repository at this point in the history
update vendors and adjust to seo bundle changes
  • Loading branch information
dbu committed May 3, 2014
2 parents d9f7dba + e518765 commit 7a4665e
Show file tree
Hide file tree
Showing 10 changed files with 254 additions and 165 deletions.
1 change: 1 addition & 0 deletions app/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public function registerBundles()
new Symfony\Cmf\Bundle\BlockBundle\CmfBlockBundle(),
new Symfony\Cmf\Bundle\SimpleCmsBundle\CmfSimpleCmsBundle(),
new Symfony\Cmf\Bundle\SeoBundle\CmfSeoBundle(),
new \Burgov\Bundle\KeyValueFormBundle\BurgovKeyValueFormBundle(),
new Liip\SearchBundle\LiipSearchBundle(),
new Symfony\Cmf\Bundle\SearchBundle\CmfSearchBundle(),
new Symfony\Cmf\Bundle\MediaBundle\CmfMediaBundle(),
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@
"sonata-project/jquery-bundle": "1.8.3",
"symfony-cmf/block-bundle": "1.1.*",
"eko/feedbundle": "1.0.*",
"lunetics/locale-bundle": "2.2.*",
"lunetics/locale-bundle": "2.3.*",
"liip/imagine-bundle": "0.21.*",
"wjzijderveld/check-bundles": "1.0.*",
"helios-ag/fm-elfinder-bundle": "1.4.*"
"helios-ag/fm-elfinder-bundle": "1.4.*",
"burgov/key-value-form-bundle": "1.0.*"
},
"require-dev": {
"liip/functional-test-bundle": "1.0.*",
Expand Down

0 comments on commit 7a4665e

Please sign in to comment.