]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorJulien Pauli <jpauli@php.net>
Fri, 8 Jul 2016 14:32:42 +0000 (16:32 +0200)
committerJulien Pauli <jpauli@php.net>
Fri, 8 Jul 2016 14:32:42 +0000 (16:32 +0200)
* PHP-7.0:
  Updated NEWS
  Updated NEWS
  update filter_var filters for ipv4 addresses to reflect rfc6890

1  2 
ext/filter/logical_filters.c

Simple merge