Browse Source

Merge branch 'PHP-5.6'

* PHP-5.6:
  Bump header year
  Update NEWS

Conflicts:
	NEWS
pull/1132/head
Reeze Xia 11 years ago
parent
commit
7109a39ddb
  1. 2
      header

2
header

@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 7 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2014 The PHP Group |
| Copyright (c) 1997-2015 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |

Loading…
Cancel
Save