summaryrefslogtreecommitdiff
path: root/EXTENSIONS
diff options
context:
space:
mode:
authorSara Golemon <sgolemon@fb.com>2014-10-02 18:55:14 -0700
committerSara Golemon <sgolemon@fb.com>2014-10-02 18:55:14 -0700
commit2cf94189a2ff97874469b7c0027713aaab7d74b1 (patch)
tree6c5f2734bd454bf65cb92f1ebc3e1fb17ff0b4f7 /EXTENSIONS
parentd7b01aff89bab42c6672b3a432983137fae8a0ab (diff)
parent4e7b31a0dbe47d9218ff6a30f50121ddb612ce19 (diff)
downloadphp-git-2cf94189a2ff97874469b7c0027713aaab7d74b1.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Add hash to EXTENSIONS file
Diffstat (limited to 'EXTENSIONS')
-rw-r--r--EXTENSIONS6
1 files changed, 6 insertions, 0 deletions
diff --git a/EXTENSIONS b/EXTENSIONS
index 61a1688b3c..af9007732b 100644
--- a/EXTENSIONS
+++ b/EXTENSIONS
@@ -385,6 +385,12 @@ MAINTENANCE: Maintained
STATUS: Working
SINCE: 4.0.4
-------------------------------------------------------------------------------
+EXTENSION: hash
+PRIMARY MAINTAINER: Sara Golemon <pollita@php.net>, Mike Wallner <mike@php.net>, Anatol Belski <ab@php.net>
+MAINTENANCE: Maintained
+STATUS: Working
+SINCE: 5.1.2
+-------------------------------------------------------------------------------
EXTENSION: iconv
PRIMARY MAINTAINER: Moriyoshi Koizumi <moriyoshi@php.net>
MAINTENANCE: Maintained