]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 05:15:34 +0000 (05:15 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 05:15:34 +0000 (05:15 +0000)
* PHP-7.0:
  Fixed #72974 imap is undefined service on AIX

1  2 
ext/standard/basic_functions.c

Simple merge