diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-13 15:56:28 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-13 15:56:28 -0500 |
| commit | b8bb16f8e7b1ec41b596e8b6526739c705dcd09f (patch) | |
| tree | 635df030b09c88e8c716321790e523551a9572e1 /phpBB/composer.json | |
| parent | 3918b228f7556ceb33e34483797db08fd8125749 (diff) | |
| parent | 424080c45a75e3354d6bd98d381442c223e5bf27 (diff) | |
| download | forums-b8bb16f8e7b1ec41b596e8b6526739c705dcd09f.tar forums-b8bb16f8e7b1ec41b596e8b6526739c705dcd09f.tar.gz forums-b8bb16f8e7b1ec41b596e8b6526739c705dcd09f.tar.bz2 forums-b8bb16f8e7b1ec41b596e8b6526739c705dcd09f.tar.xz forums-b8bb16f8e7b1ec41b596e8b6526739c705dcd09f.zip | |
Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
* remotes/upstream/develop-olympus:
[ticket/11831] getAttribute was replaced with attr
[ticket/11831] Update fabpot/goutte to 1.0.*
Conflicts:
phpBB/composer.lock
Diffstat (limited to 'phpBB/composer.json')
| -rw-r--r-- | phpBB/composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index d3a24d7964..455ad49aac 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -11,7 +11,7 @@ "twig/twig": "1.13.*" }, "require-dev": { - "fabpot/goutte": "v0.1.0", + "fabpot/goutte": "1.0.*", "phpunit/dbunit": "1.2.*", "phpunit/phpunit": "3.7.*", "phing/phing": "2.4.*" |