]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6166a0d 8c653c1)
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 05:25:17 +0000 (05:25 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 05:25:17 +0000 (05:25 +0000)
* PHP-7.0:
  update ip2long_varation2 test to skip for AIX, see bug #72973


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.