]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.2' into PHP-7.3
authorChristoph M. Becker <cmbecker69@gmx.de>
Thu, 9 May 2019 14:55:35 +0000 (16:55 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Thu, 9 May 2019 14:55:35 +0000 (16:55 +0200)
commitfd1ffa4692dd91af08ea019fc2db0d8b3835dfe9
treec31f4ed408ceb0a93612b7e469450228983419f6
parent90318fbcbed95e9f4469d697d47f76b9bd12e17f
parent27f168cf638183716d02ff1973856c8d5ef71273
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix erroneous assertions
win32/codepage.c