From 75693292de2d907bf2a4b0f12abd7cd68781f95a Mon Sep 17 00:00:00 2001
From: Benny Baumann <BenBE@geshi.org>
Date: Sun, 14 Jul 2013 22:23:52 +0200
Subject: bug 1123: fixed merge conflicts on testserver

---
 pages/gpg/0.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pages/gpg')

diff --git a/pages/gpg/0.php b/pages/gpg/0.php
index 60b1784..c513793 100644
--- a/pages/gpg/0.php
+++ b/pages/gpg/0.php
@@ -19,6 +19,8 @@
 ?>
 <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>
-- 
cgit v1.2.1