]> granicus.if.org Git - php/commitdiff
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)
* PHP-7.1:
  Remove remnants of TSMRLS_* macro calls

1  2 
sapi/cli/php_cli_server.c
sapi/litespeed/lsapi_main.c

Simple merge
Simple merge