Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix recent merge regressions

  • Loading branch information...
commit cf489399e2c34b197a10ec6359f2e5b20a773f76 1 parent 6b605dc
@TomAdam TomAdam authored
Showing with 7 additions and 8 deletions.
  1. +2 −3 .travis.yml
  2. +5 −5 composer.json
View
5 .travis.yml
@@ -5,12 +5,11 @@ php:
- 5.4
env:
- - SYMFONY_VERSION=v2.0.13
- - SYMFONY_VERSION=origin/2.0
+ - SYMFONY_VERSION=origin/master
before_script:
- wget -nc http://getcomposer.org/composer.phar
- php composer.phar install
notifications:
- webhooks: http://sonata-project.org/bundles/user/2-0/travis
+ webhooks: http://sonata-project.org/bundles/user/master/travis
View
10 composer.json
@@ -18,17 +18,17 @@
],
"require": {
"php": ">=5.3.2",
- "symfony/framework-bundle": "2.*",
- "sonata-project/admin-bundle": "master-dev",
+ "symfony/framework-bundle": "2.1.*",
+ "sonata-project/admin-bundle": "dev-master",
"friendsofsymfony/user-bundle": "dev-master",
"sonata-project/doctrine-extensions": "dev-master",
- "sonata-project/easy-extends-bundle": "*"
+ "sonata-project/easy-extends-bundle": "dev-master"
},
"suggest": {
- "sonata-project/doctrine-orm-admin-bundle": "2.0.*"
+ "sonata-project/doctrine-orm-admin-bundle": "dev-master"
},
"autoload": {
"psr-0": { "Sonata\\UserBundle": "" }
},
"target-dir": "Sonata/UserBundle"
-}
+}
Please sign in to comment.
Something went wrong with that request. Please try again.