Merge branch 'master' into php5

* master: Add Blowfish and Twofish as composer keywords.
2024-11-30 04:39:02 +01:00 · 2013-11-26 19:35:49 +01:00 · 2013-11-26 19:35:49 +01:00 · 6e10eb195d
commit 6e10eb195d
parent bc8615e4ba 1832c1743c
1 changed files with 2 additions and 0 deletions
--- a/composer.json
+++ b/composer.json
@ -11,6 +11,8 @@
        "signing",
        "rsa",
        "aes",
+        "blowfish",
+        "twofish",
        "ssh",
        "sftp",
        "x509",