From: Felix Dörre <felix@dogcraft.de>
Date: Thu, 7 Apr 2016 11:59:33 +0000 (+0200)
Subject: Merge commit '0176ca7cda25ad88e9faa116ffa139ca926de273' into HEAD
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=6e23ad9bc75d6cb2aa86cb36654a6ef44a167011;hp=-c

Merge commit '0176ca7cda25ad88e9faa116ffa139ca926de273' into HEAD
---

6e23ad9bc75d6cb2aa86cb36654a6ef44a167011
diff --combined util-testing/org/cacert/gigi/pages/Manager.templ
index a7101ec2,9735e9a5..2efd14ad
--- a/util-testing/org/cacert/gigi/pages/Manager.templ
+++ b/util-testing/org/cacert/gigi/pages/Manager.templ
@@@ -24,6 -24,7 +24,7 @@@ Email: <input type="text" name="email"/
  <option>blockedlogin</option>
  <option>ttp-assurer</option>
  <option>ttp-applicant</option>
+ <option>nucleus-assurer</option>
  <option>codesigning</option>
  <option>orgassurer</option>
  </select>
@@@ -54,14 -55,6 +55,14 @@@ Email: <input type="text" name="assureE
  <input type="submit" value="Assure 100 Points" name="assure"/>
  </td></tr>
  
 +<tr><td>
 +Assure 25 others (get 25 experience points)	:
 +</td><td>
 +Email: <input type="text" name="letassureEmail"/>
 +</td><td>
 +<input type="submit" value="Add 25 experience Points" name="letassure"/>
 +</td></tr>
 +
  <tr><td>
  Add verified Email:
  </td><td>