]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1'
authorJoe Watkins <krakjoe@php.net>
Wed, 18 Jan 2017 17:46:35 +0000 (17:46 +0000)
committerJoe Watkins <krakjoe@php.net>
Wed, 18 Jan 2017 17:46:35 +0000 (17:46 +0000)
commit409467dc2f7dcd9586dda4855c2f404ebdf1d5c9
tree55ad8c5ac6a876beb722f95bca5859804c7443ee
parentf485aca64685137aaa48f18cb561049770787a09
parentbbe21ccf3877835d8c7c6aaadcbd9e4d20054c8b
Merge branch 'PHP-7.1'

* PHP-7.1:
  Remove remnants of TSMRLS_* macro calls
sapi/cli/php_cli_server.c
sapi/litespeed/lsapi_main.c