]> granicus.if.org Git - php/commit
Merge branch 'pull-request/2274' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Wed, 4 Jan 2017 22:25:45 +0000 (22:25 +0000)
committerJoe Watkins <krakjoe@php.net>
Wed, 4 Jan 2017 22:25:45 +0000 (22:25 +0000)
commit7b436b0c48b7fb089aa6d97075b72f7a9eed4a98
tree35c29f62cf7fbd59db5fd156991881717424b618
parent178c7d01f217f89d3cb33d35bc18812539aaf57e
parent1f620efe3c02c6863290bbcb65d0f7344f9f1db6
Merge branch 'pull-request/2274' into PHP-7.1

* pull-request/2274:
  Update copyright headers to 2017