[commits] Horde branch master updated. 458ba44d19262e59cfa727a7a6accdd946884bc6
Michael M Slusarz
slusarz at horde.org
Tue Dec 6 18:41:15 UTC 2011
The branch "master" has been updated.
The following is a summary of the commits.
from: 544ebe450f2941522b615a62a8b018d6a277bbc3
458ba44 Revert "[mms] Allow expiration date to be provided when creating personal PGP key (Request #5754)."
-----------------------------------------------------------------------
commit 458ba44d19262e59cfa727a7a6accdd946884bc6
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 6 11:40:59 2011 -0700
Revert "[mms] Allow expiration date to be provided when creating personal PGP key (Request #5754)."
This reverts commit f76b7572faa4b736f5781febed7b1b4fb5f0abc3.
Conflicts:
imp/docs/CHANGES
imp/package.xml
Moved to 5.1
imp/docs/CHANGES | 2 -
imp/js/pgp.js | 61 --------------------------------
imp/lib/Crypt/Pgp.php | 16 ++++-----
imp/lib/Prefs/Ui.php | 13 +------
imp/package.xml | 4 +--
imp/templates/prefs/pgpprivatekey.html | 16 --------
6 files changed, 9 insertions(+), 103 deletions(-)
delete mode 100644 imp/js/pgp.js
http://git.horde.org/horde-git/-/commit/458ba44d19262e59cfa727a7a6accdd946884bc6
More information about the commits
mailing list