]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 24 Feb 2017 22:22:46 +0000 (23:22 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 24 Feb 2017 22:22:46 +0000 (23:22 +0100)
1  2 
ext/hash/hash_gost.c

Simple merge