diff options
author | Joe Watkins <krakjoe@php.net> | 2017-01-18 17:23:29 +0000 |
---|---|---|
committer | Joe Watkins <krakjoe@php.net> | 2017-01-18 17:23:29 +0000 |
commit | bce548d8e699c8e7d1a0cbbeb0ce4de4b0f0131d (patch) | |
tree | 62f21b56d890a024fa9913e6cba0cbfe210ef85a /sapi/cli/php_cli_server.c | |
parent | 85589ca6606f70a3d1331e7d959ec60f4204a9fe (diff) | |
parent | 280e9cb28d07a69e56ebcde4c368f3053298abe3 (diff) | |
download | php-git-bce548d8e699c8e7d1a0cbbeb0ce4de4b0f0131d.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions