From 87380005710ea13013e6c8632a5095332ca28ad6 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sun, 9 Aug 2015 18:44:31 +0100 Subject: [PATCH] Update branch alias --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 6723f81e..95623ad5 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "php-console/php-console": "^3.1.3", "phpunit/phpunit-mock-objects": "2.3.0" }, - "_": "phpunit/phpunit-mock-objects required in 2.3.0 due to https://github.com/sebastianbergmann/phpunit-mock-objects/issues/223", + "_": "phpunit/phpunit-mock-objects required in 2.3.0 due to https://github.com/sebastianbergmann/phpunit-mock-objects/issues/223 - needs hhvm 3.8+ on travis", "suggest": { "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", "raven/raven": "Allow sending log messages to a Sentry server", @@ -52,7 +52,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.15.x-dev" + "dev-master": "1.16.x-dev" } }, "scripts": {