]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f47ce9 897bdb4)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 2 Nov 2017 20:25:34 +0000 (23:25 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 2 Nov 2017 20:25:34 +0000 (23:25 +0300)
* 'master' of git.php.net:php-src:
  Fix #74922 - Try to resolve constants when importing trait properties
  Fix ext/soap/tests/bug69137.phpt
  Don't dup after fetch_dimension_const
  Small browscap cleanup


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