diff options
| author | Xinchen Hui <laruence@php.net> | 2015-01-17 13:21:36 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-01-17 13:21:36 +0800 |
| commit | b118d7b697ba310989aeadcd9569e658db8d44f5 (patch) | |
| tree | 401915a28b9f87e7462194c7abdc8b2e42a9bdbb | |
| parent | 25041d2af2f7a5b50a6c6a6f0515521aa2edfac9 (diff) | |
| parent | fa3808bacc8eeabd0f2efabf031300935c83f159 (diff) | |
| download | php-git-b118d7b697ba310989aeadcd9569e658db8d44f5.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | LICENSE | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ -------------------------------------------------------------------- The PHP License, version 3.01 -Copyright (c) 1999 - 2014 The PHP Group. All rights reserved. +Copyright (c) 1999 - 2015 The PHP Group. All rights reserved. -------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without |