]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1' into PHP-7.2
authorJoe Watkins <krakjoe@php.net>
Thu, 19 Oct 2017 10:54:01 +0000 (11:54 +0100)
committerJoe Watkins <krakjoe@php.net>
Thu, 19 Oct 2017 10:54:01 +0000 (11:54 +0100)
commitcf91d81b31c61db28fb96c116186b60db771b20d
treeb084f22a245c1a1484e4c51af0d66c716b215ebb
parent0397b8c5c5b78f11a4eefa6302c303c56ac32b32
parent85c243ef662a407542d2bbcbcafc43d5b9f01f16
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update .editorconfig with some more configs