Merge branch '2.3'

This commit is contained in:
Graham Campbell
2016-06-10 08:56:18 +01:00

10
composer.lock generated
View File

@@ -4421,16 +4421,16 @@
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "3.0.2",
"version": "3.0.3",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "45ada3e3fd09789fbfbd6d65b3f0901f0030dc61"
"reference": "ea48fd2c79b68fba8693ae67a21cae5b5ee4cfb8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/45ada3e3fd09789fbfbd6d65b3f0901f0030dc61",
"reference": "45ada3e3fd09789fbfbd6d65b3f0901f0030dc61",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/ea48fd2c79b68fba8693ae67a21cae5b5ee4cfb8",
"reference": "ea48fd2c79b68fba8693ae67a21cae5b5ee4cfb8",
"shasum": ""
},
"require": {
@@ -4462,7 +4462,7 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2016-06-06 06:44:13"
"time": "2016-06-10 07:04:47"
},
{
"name": "phpdocumentor/type-resolver",