summaryrefslogtreecommitdiff
path: root/pages/gpg/2.php
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-08-25 00:27:52 +0200
committerMichael Tänzer <neo@nhng.de>2013-08-25 00:27:52 +0200
commitc6fd753005d2651382fc8aa21933376225035a31 (patch)
tree0c930329a4d50f389e49ff97c15b5c651b7864f8 /pages/gpg/2.php
parent75693292de2d907bf2a4b0f12abd7cd68781f95a (diff)
downloadcacert-devel-c6fd753005d2651382fc8aa21933376225035a31.tar.gz
cacert-devel-c6fd753005d2651382fc8aa21933376225035a31.tar.xz
cacert-devel-c6fd753005d2651382fc8aa21933376225035a31.zip
Revert "bug 1123: fixed merge conflicts on testserver"
This reverts commit 75693292de2d907bf2a4b0f12abd7cd68781f95a.
Diffstat (limited to 'pages/gpg/2.php')
0 files changed, 0 insertions, 0 deletions