]> granicus.if.org Git - php/commit
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)
commit3f6693c5e01f42e51bef8c8664abacfaccfdf3fa
treeb7546d3f16b52559baccac4fb4e56d3f229f4874
parent5f47ce9127ec9123ba2359bb05cf180c8a4177b6
parent897bdb42f084e20eaf8a4b88829fc94f72626fd0
Merge branch 'master' of git.php.net:php-src

* '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