]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f4707ed 60e181c)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 09:25:21 +0000 (11:25 +0200)
committerAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 09:25:21 +0000 (11:25 +0200)
commit64df05d5b1908314fae212fcaf8632a68bd9996d
treedea0183a8c335b837a83dea84ce9a698ee810843tree | snapshot
parentf4707ed2560abf1dcdad2796ba4648ee4b17ecdacommit | diff
parent60e181c20ac801292b3e21afc845b700b04cf586commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
  Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
ext/standard/info.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.