]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Thu, 19 Oct 2017 10:53:50 +0000 (11:53 +0100)
committerJoe Watkins <krakjoe@php.net>
Thu, 19 Oct 2017 10:53:50 +0000 (11:53 +0100)
commit85c243ef662a407542d2bbcbcafc43d5b9f01f16
tree7fee0f7b603cbaa31ab3d71fb5f72ae7bb94b302
parentbb1814b5c3ae78d1d3cb383f58a9729227138b7c
parentaa143515d656ef915ed6636382a88da9792ee796
Merge branch 'PHP-7.0' into PHP-7.1

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