Permalink
Browse files

Merge remote-tracking branch 'origin/master' into slideshow

  • Loading branch information...
elHornair committed Mar 6, 2013
2 parents 57bda6e + 34b949c commit be0c58d3aef14081935002acb0681a5123c8d7b5
Showing with 3 additions and 3 deletions.
  1. +1 −1 .travis.yml
  2. +2 −2 composer.json
View
@@ -5,7 +5,7 @@ env:
- SYMFONY_VERSION=dev-master
before_script:
- - composer require symfony/symfony:${SYMFONY_VERSION}
+ - composer require symfony/framework-bundle:${SYMFONY_VERSION}
- composer install --dev
script: phpunit --coverage-text
View
@@ -14,10 +14,10 @@
"minimum-stability": "dev",
"require": {
"php": ">=5.3.2",
- "symfony/symfony": ">=2.1,<2.3-dev",
+ "symfony/framework-bundle": ">=2.1,<2.3-dev",
"doctrine/phpcr-bundle" :"1.0.*",
"doctrine/phpcr-odm": "1.0.*",
- "sonata-project/block-bundle": "dev-master"
+ "sonata-project/block-bundle": "2.1.1"
},
"require-dev": {
"sonata-project/cache-bundle": "dev-master"

0 comments on commit be0c58d

Please sign in to comment.