]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Tue, 3 Oct 2017 06:15:02 +0000 (07:15 +0100)
committerJoe Watkins <krakjoe@php.net>
Tue, 3 Oct 2017 06:15:02 +0000 (07:15 +0100)
commit2019b25daa7fbe257fc72f31d18f54f1fa91e452
tree5664e00e1f991aaa080ce83d734c6c73ab97c8f9
parent03aef5f65cea1dac9db5fa8254b4776eba88441f
parent7b248a1b3266c4d9e7c8e3f9842903225669d866
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Remove ident gitattribute for ext/zip/php_zip.c