summaryrefslogtreecommitdiff
path: root/build-aux/git-authenticate.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-03-10 20:45:24 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-03-10 20:45:24 +0100
commit2d421c4f19a0669879c9a8738361a151b1431d4f (patch)
treed814cdb0fa1bdf763973ea43d89e22eab1da42e0 /build-aux/git-authenticate.scm
parentb3b5714fa72bf661003f27fbccba5697f5810115 (diff)
parent90799c35bd9cadaf7c28be5ea6e41ec692d5b4a4 (diff)
downloadpatches-2d421c4f19a0669879c9a8738361a151b1431d4f.tar
patches-2d421c4f19a0669879c9a8738361a151b1431d4f.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'build-aux/git-authenticate.scm')
-rw-r--r--build-aux/git-authenticate.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm
index 640dedbff5..514d201c80 100644
--- a/build-aux/git-authenticate.scm
+++ b/build-aux/git-authenticate.scm
@@ -169,8 +169,12 @@
"BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC")
("rhelling"
"0154 E1B9 1CC9 D9EF 7764 8DE7 F3A7 27DB 44FC CA36")
- ("roelj"
+ ("roelj (old)"
"17CB 2812 EB63 3DFF 2C7F 0452 C3EC 1DCA 8430 72E1")
+ ("roelj"
+ ;; From commit cc51c03ff867d4633505354819c6d88af88bf919 (March 2020).
+ ;; See <https://lists.gnu.org/archive/html/guix-devel/2020-03/msg00070.html>.
+ "F556 FD94 FB8F 8B87 79E3 6832 CBD0 CD51 38C1 9AFC")
("roptat (old)"
"B5FA E628 5B41 3728 B2A0 FAED 4311 1F45 2008 6A0C")
("roptat"