summaryrefslogtreecommitdiff
path: root/pages/gpg
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-08-13 21:14:27 +0200
committerBenny Baumann <BenBE@geshi.org>2013-08-13 21:14:27 +0200
commite4d5df60c1c443d0e4a516cc9aa5d5d7cdb0b55a (patch)
tree7d6a142704c71ad6784d4b676a329e0a179a2f49 /pages/gpg
parent4193c98693d25611e2b99d975d70bd06e1417a95 (diff)
parent33bd853d0e7034f1ad0755dd717655b650ba541f (diff)
downloadcacert-devel-e4d5df60c1c443d0e4a516cc9aa5d5d7cdb0b55a.tar.gz
cacert-devel-e4d5df60c1c443d0e4a516cc9aa5d5d7cdb0b55a.tar.xz
cacert-devel-e4d5df60c1c443d0e4a516cc9aa5d5d7cdb0b55a.zip
Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137
Conflicts: includes/notary.inc.php
Diffstat (limited to 'pages/gpg')
0 files changed, 0 insertions, 0 deletions