]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd4a78b e535b80)
Merge branch 'PHP-7.1'
authorSara Golemon <pollita@php.net>
Tue, 23 May 2017 23:29:11 +0000 (16:29 -0700)
committerSara Golemon <pollita@php.net>
Tue, 23 May 2017 23:29:11 +0000 (16:29 -0700)
7.1.x release shouldn't have been pn mainline PHP-7.1 branch
Fix the merge history to keep master in place.

* PHP-7.1:
  bump versions


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