Merge branch '2.7' of github.com:cakephp/cakephp into 2.7

This commit is contained in:
mark_story 2015-06-26 22:39:54 -04:00
commit b9e617997e

View file

@ -18,7 +18,7 @@
"source": "https://github.com/cakephp/cakephp" "source": "https://github.com/cakephp/cakephp"
}, },
"require": { "require": {
"php": ">=5.2.8", "php": ">=5.3.0",
"ext-mcrypt": "*" "ext-mcrypt": "*"
}, },
"require-dev": { "require-dev": {