]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2dabc4c e8d36ce)
Merge branch 'PHP-7.3' into PHP-7.4
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 4 Sep 2020 08:59:41 +0000 (10:59 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 4 Sep 2020 08:59:41 +0000 (10:59 +0200)
* PHP-7.3:
  Avoid duplicate octal warning during heredoc scan ahead

1  2 
Zend/zend_language_scanner.l patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_language_scanner.l
Simple merge
Unnamed repository; edit this file 'description' to name the repository.