diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-15 13:30:50 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-15 13:30:50 +0100 |
| commit | 67d58aa7b8ac498b52c82f09a19d981fa2c1c80e (patch) | |
| tree | 7658b69b5d9e806df3983fc49eb4a05815a1d37c /phpBB | |
| parent | 5c2ef741a6153fe3dfabdf7dbcc405a9fae8d41d (diff) | |
| parent | 681836a84db02fce501d33c66f9fba3d07c5c9f9 (diff) | |
| download | forums-67d58aa7b8ac498b52c82f09a19d981fa2c1c80e.tar forums-67d58aa7b8ac498b52c82f09a19d981fa2c1c80e.tar.gz forums-67d58aa7b8ac498b52c82f09a19d981fa2c1c80e.tar.bz2 forums-67d58aa7b8ac498b52c82f09a19d981fa2c1c80e.tar.xz forums-67d58aa7b8ac498b52c82f09a19d981fa2c1c80e.zip | |
Merge branch 'ticket/14538' into ticket/14538-3.2.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/composer.lock | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock index d10c94a75f..f5ad5b7caa 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -1300,6 +1300,10 @@ "ircmaxell/password-compat": "~1.0", "php": ">=5.3.3" }, + "require-dev": { + "symfony/debug": "~2.7", + "symfony/phpunit-bridge": "~2.7" + }, "type": "library", "extra": { "branch-alias": { @@ -2727,7 +2731,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { |