granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 78ad5e8 3fd7d81)

author	Joe Watkins <krakjoe@php.net>
	Tue, 25 Jul 2017 05:58:23 +0000 (06:58 +0100)
committer	Joe Watkins <krakjoe@php.net>
	Tue, 25 Jul 2017 05:58:37 +0000 (06:58 +0100)
commit	238f837cbce468dd0b601bf0f0e54d6e7fb4b40b
tree	373f0c3595b7257ad7e3bd56f2a06d453780f17b	tree \| snapshot
parent	78ad5e8864feec55e3aecfd96b369a62ffb953ee	commit \| diff
parent	3fd7d819b8ea164bdf255cddcd0a1b1d156f4a3b	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed finding CURL on systems with multiarch support

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