Merge branch 'master' of git://github.com/yiisoft/yii2 into get-headers

a42710ad · Vladimir Zbrailov · 53647d8b · c4db587b · a42710ad
Commit a42710ad authored Jan 22, 2014 by Vladimir Zbrailov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

composer.json extensions/apidoc/composer.json +1 -1

No files found.
--- a/extensions/apidoc/composer.json
+++ b/extensions/apidoc/composer.json
@@ -20,7 +20,7 @@
    "minimum-stability": "dev",
 	"require": {
 		"yiisoft/yii2": "*",
-		"phpdocumentor/reflection": "1.0.2"
+		"phpdocumentor/reflection": "dev-master | >1.0.2"
 	},
 	"autoload": {
 		"psr-4": { "yii\\apidoc\\": "" }