summaryrefslogtreecommitdiff
path: root/.guix-authorizations
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2020-09-05 21:56:34 +0300
committerEfraim Flashner <efraim@flashner.co.il>2020-09-05 22:30:04 +0300
commitde3c03a47160dec355d9b19ad5ca210d90c15fd7 (patch)
tree4ca6dc05b5fc9530d812bbb269f1c61ab9efccf3 /.guix-authorizations
parentab6fe9d362046231ad6f46eccfd1ea2c9c80b401 (diff)
parentb8477cab7bccc4191ed3dfa3f149aec7917834d8 (diff)
downloadguix-patches-de3c03a47160dec355d9b19ad5ca210d90c15fd7.tar
guix-patches-de3c03a47160dec355d9b19ad5ca210d90c15fd7.tar.gz
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to '.guix-authorizations')
-rw-r--r--.guix-authorizations3
1 files changed, 3 insertions, 0 deletions
diff --git a/.guix-authorizations b/.guix-authorizations
index 7b3f2dfd1f..ee164083c8 100644
--- a/.guix-authorizations
+++ b/.guix-authorizations
@@ -101,6 +101,9 @@
(name "ngz"))
("CEF4 CB91 4856 BA38 0A20 A7E2 3008 88CB 39C6 3817"
(name "pelzflorian"))
+ (;; primary: "41CA 12EA DE0C F33F 6885 A58F 5719 6E37 E00B 77FD"
+ "72D5 3D81 8CB6 F4A1 7258 374C A8FC 9E44 7F4F 7D54"
+ (name "planglois"))
(;; primary: "B68B DF22 73F9 DA0E 63C1 8A32 515B F416 9242 D600"
"C699 ED09 E51B CE89 FD1D A078 AAC7 E891 896B 568A"
(name "pgarlick"))