]> granicus.if.org Git - php/commitdiff
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)
* PHP-7.1:
  Update .editorconfig with some more configs


Trivial merge