Merge branch '3.2.x'

* 3.2.x:
  [ticket/15103] Update fast-image-size to 1.1.3
This commit is contained in:
Tristan Darricau 2017-04-18 23:07:41 +02:00
commit a4d1c60b00
No known key found for this signature in database
GPG key ID: 817043C2E29DB881

10
phpBB/composer.lock generated
View file

@ -322,16 +322,16 @@
}, },
{ {
"name": "marc1706/fast-image-size", "name": "marc1706/fast-image-size",
"version": "v1.1.2", "version": "v1.1.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/marc1706/fast-image-size.git", "url": "https://github.com/marc1706/fast-image-size.git",
"reference": "8bb644f8f767c5763acd61140045a78d10e1eb06" "reference": "5f7e8377746524e2b8a49a631c1fc9afeb9d8bee"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/8bb644f8f767c5763acd61140045a78d10e1eb06", "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/5f7e8377746524e2b8a49a631c1fc9afeb9d8bee",
"reference": "8bb644f8f767c5763acd61140045a78d10e1eb06", "reference": "5f7e8377746524e2b8a49a631c1fc9afeb9d8bee",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -369,7 +369,7 @@
"php", "php",
"size" "size"
], ],
"time": "2016-10-30 19:00:39" "time": "2017-03-26 12:48:28"
}, },
{ {
"name": "ocramius/proxy-manager", "name": "ocramius/proxy-manager",