summaryrefslogtreecommitdiff
path: root/pages
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
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')
-rw-r--r--pages/gpg/0.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/pages/gpg/0.php b/pages/gpg/0.php
index c513793..60b1784 100644
--- a/pages/gpg/0.php
+++ b/pages/gpg/0.php
@@ -19,8 +19,6 @@
?>
<p><?=_("Paste your own public OpenPGP key below. It should not contain a picture. CAcert will sign your key after submission.")?></p>
<form method="post" action="gpg.php">
-<p><?=_("Optional comment, only used in the certifictate overview")?><br />
- <input type="text" name="description" maxlength="80" size=80 /></p>
<textarea name="CSR" cols="80" rows="15"><?=array_key_exists('CSR',$_POST)?strip_tags($_POST['CSR']):""?></textarea><br />
<p><input type="checkbox" name="CCA" /> <strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong><br />
<?=_("Please Note: You need to accept the CCA to proceed.")?></p>