]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b36d8d 4cce1e9)
Merge branch 'PHP-7.1'
authorChristoph M. Becker <cmbecker69@gmx.de>
Thu, 5 Jan 2017 17:42:58 +0000 (18:42 +0100)
committerChristoph M. Becker <cmbecker69@gmx.de>
Thu, 5 Jan 2017 17:42:58 +0000 (18:42 +0100)
* PHP-7.1:
  wrong version

# Conflicts:
# main/php_version.h


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