From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 3 Sep 2018 10:26:42 +0000 (+0200)
Subject: Merge branch 'PHP-7.3'
X-Git-Tag: php-7.4.0alpha1~2012
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d36cb3d30ea460db5886c673a0f8ecd5db9bf303;p=php

Merge branch 'PHP-7.3'

* PHP-7.3:
  Update to Oniguruma 6.9.0
---

d36cb3d30ea460db5886c673a0f8ecd5db9bf303
diff --cc ext/mbstring/oniguruma/index.html
index 82405af82c,f55084e08e..f55084e08e
mode 100644,100755..100644
--- a/ext/mbstring/oniguruma/index.html
+++ b/ext/mbstring/oniguruma/index.html