]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Tue, 12 Feb 2019 09:29:02 +0000 (12:29 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 12 Feb 2019 09:29:02 +0000 (12:29 +0300)
* 'master' of git.php.net:php-src:
  Adding bunch of FreeBSD socket options flags specifics.


Trivial merge