Skip to content

Commit

Permalink
Merge pull request #152 from symfony-cmf/prepare-1.3
Browse files Browse the repository at this point in the history
prepare 1.3 relase
  • Loading branch information
dbu committed Mar 31, 2016
2 parents 6397d77 + 43c3c66 commit d98c186
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
matrix:
include:
- php: 5.6
env: DEPS=dev
env: DEPS=dev SYMFONY_VERSION=2.8.*
- php: 5.3
env: COMPOSER_FLAGS="--prefer-lowest"
- php: 5.6
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"require-dev": {
"twig/twig": "^1.12|^2.0",
"symfony-cmf/testing": "^1.3@RC",
"symfony-cmf/testing": "^1.3",
"doctrine/phpcr-odm": "^1.3",
"doctrine/annotations": "^1.1.2",
"jms/serializer-bundle": "^0.12|^1.0",
Expand Down

0 comments on commit d98c186

Please sign in to comment.