]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Mon, 5 Sep 2016 07:41:23 +0000 (00:41 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 5 Sep 2016 07:41:23 +0000 (00:41 -0700)
* PHP-5.6:
  Added editorconfig file


Trivial merge