Add ap2249 to teampubkeys

added 15 commits

• 856cbdae...e13fae3b - 14 commits from branch master
• 25930f8f - Merge branch 'master' into add-ap2249-to-teampubkeys

Compare with previous version

added placeholder label

Diff looks sensible:

--- before.txt  2021-07-28 13:11:34.357927660 +0100
+++ after.txt   2021-07-28 13:11:29.261869693 +0100
@@ -1,4 +1,4 @@
-./teampubkeys(2).gpg
+./teampubkeys(1).gpg
 --------------------
 pub   rsa2048 2011-06-23 [SC]
       C01CA0696BD7455240A30B41C93CF39D73ED24A3
@@ -56,3 +56,8 @@
 uid           [ unknown] Sam Wenham <sam@wenhams.co.uk>
 sub   rsa4096 2017-02-07 [E]
 
+pub   rsa4096 2021-06-08 [SC]
+      C462BC277E92FB6AE80AE95D268EC6B36E079C5E
+uid           [ unknown] Andre Parmeggiani <ap2249@cam.ac.uk>
+sub   rsa4096 2021-06-08 [E]
+

approved this merge request

mentioned in commit 31edee82

merged