Merge branch 'master' of github.com:php-task/TaskBundle

wachterjohannes · wachterjohannes · commit f65966bf15bd · 2016-01-30T20:59:22.000+01:00
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "~5.5 || ~7.0",
         "php-task/php-task": "1.0.x-dev@dev",
         "symfony/http-kernel": "^2.6",
         "symfony/dependency-injection": "^2.6",

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"require": {`
`13`		`- "php": "^5.5 \|\| ^7.0",`
	`13`	`+ "php": "~5.5 \|\| ~7.0",`
`14`	`14`	`"php-task/php-task": "1.0.x-dev@dev",`
`15`	`15`	`"symfony/http-kernel": "^2.6",`
`16`	`16`	`"symfony/dependency-injection": "^2.6",`