Merge branch '3.2.x'

This commit is contained in:
Máté Bartus 2016-07-19 19:24:52 +02:00
commit 0336bef2d9

18
phpBB/composer.lock generated
View file

@ -1927,20 +1927,19 @@
}, },
{ {
"name": "facebook/webdriver", "name": "facebook/webdriver",
"version": "1.1.2", "version": "1.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/facebook/php-webdriver.git", "url": "https://github.com/facebook/php-webdriver.git",
"reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986" "reference": "1c98108ba3eb435b681655764de11502a0653705"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/facebook/php-webdriver/zipball/0b889d7de7461439f8a3bbcca46e0f696cb27986", "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/1c98108ba3eb435b681655764de11502a0653705",
"reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986", "reference": "1c98108ba3eb435b681655764de11502a0653705",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-curl": "*",
"php": ">=5.3.19" "php": ">=5.3.19"
}, },
"require-dev": { "require-dev": {
@ -1967,7 +1966,7 @@
"selenium", "selenium",
"webdriver" "webdriver"
], ],
"time": "2016-06-04 00:02:34" "time": "2015-12-31 15:58:49"
}, },
{ {
"name": "laravel/homestead", "name": "laravel/homestead",
@ -2142,7 +2141,8 @@
"authors": [ "authors": [
{ {
"name": "Michiel Rook", "name": "Michiel Rook",
"email": "mrook@php.net" "email": "mrook@php.net",
"role": "Lead"
}, },
{ {
"name": "Phing Community", "name": "Phing Community",
@ -2624,9 +2624,7 @@
"authors": [ "authors": [
{ {
"name": "Fabien Potencier", "name": "Fabien Potencier",
"email": "fabien@symfony.com", "email": "fabien@symfony.com"
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
} }
], ],
"description": "Pimple is a simple Dependency Injection Container for PHP 5.3", "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",