Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '1.2' into survos

  • Loading branch information...
commit 62ca693235118b7bb345bde5a1db442c611d0226 2 parents a95b42c + ef95bcd
@kcivey kcivey authored
Showing with 3 additions and 0 deletions.
  1. +3 −0  composer.json
View
3  composer.json
@@ -16,6 +16,9 @@
"sensio/framework-extra-bundle": "~2.2",
"fzaninotto/faker": "dev-master"
},
+ "conflict": {
+ "sensio/framework-extra-bundle": ">=2.4"
+ },
"autoload": {
"psr-0": { "Propel\\PropelBundle": "" }
},
Please sign in to comment.
Something went wrong with that request. Please try again.