summaryrefslogtreecommitdiff
path: root/UPGRADING
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2014-06-05 17:45:59 +0200
committerRemi Collet <remi@php.net>2014-06-05 17:45:59 +0200
commit6a5d5d1db43e670427f83760afbdec3b28eab3d0 (patch)
tree84c75f53aa314dc1059f21299797526d03b8f825 /UPGRADING
parentb16950b5d32df8cc885f5b46c752ddf5c4f48c0d (diff)
parente31b51f9a0e5beadb250c67a0865539b3e9fb222 (diff)
downloadphp-git-6a5d5d1db43e670427f83760afbdec3b28eab3d0.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: drop exec perm on doc files
Diffstat (limited to 'UPGRADING')
-rw-r--r--[-rwxr-xr-x]UPGRADING0
1 files changed, 0 insertions, 0 deletions
diff --git a/UPGRADING b/UPGRADING
index 7a174c47c2..7a174c47c2 100755..100644
--- a/UPGRADING
+++ b/UPGRADING