diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /.guix-authorizations | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
| download | guix-2e65e4834a226c570866f2e8976ed7f252b45cd1.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in: gnu/packages/bittorrent.scm gnu/packages/databases.scm gnu/packages/geo.scm gnu/packages/gnupg.scm gnu/packages/gstreamer.scm gnu/packages/gtk.scm gnu/packages/linux.scm gnu/packages/python-xyz.scm gnu/packages/xorg.scm guix/build/qt-utils.scm
Diffstat (limited to '.guix-authorizations')
| -rw-r--r-- | .guix-authorizations | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/.guix-authorizations b/.guix-authorizations index 486798359d..bec054b04a 100644 --- a/.guix-authorizations +++ b/.guix-authorizations @@ -23,7 +23,7 @@ "39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2" (name "bandali")) (;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" - "A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566" + "A3A4 B419 0074 087C A7DE 5698 BC45 CA67 E2F8 D007" (name "bavier")) ("45CC 63B8 5258 C9D5 5F34 B239 D37D 0EA7 CECC 3912" (name "biscuolo")) @@ -73,21 +73,17 @@ (name "jlicht")) ("8141 6036 E81A 5CF7 8F80 1071 ECFC 8398 8B4E 4B9F" (name "jonsger")) - ("83B6 703A DCCA 3B69 4BCE 2DA6 E6A5 EE3C 1946 7A0D" - (name "kkebreau")) ("017D 74E2 7F58 5696 3801 781D F663 943E 08D8 092A" (name "lbraun")) ("CA4F 8CF4 37D7 478F DA05 5FD4 4213 7701 1A37 8446" (name "lbraun (professional)")) ("ACC2 3BA0 59F7 CCF4 08F0 43AD 442A 84B8 C70E 2F87" - (name "leoprikler")) + (name "lilyp")) ("45E5 75FA 53EA 8BD6 1BCE 0B4E 3ADC 75F0 13D6 78F9" (name "leungbk")) (;; primary: "4F71 6F9A 8FA2 C80E F1B5 E1BA 5E35 F231 DE1A C5E0" "B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08" (name "lfam")) - ("148B CB8B D80B FB16 B1DE 0E91 45A8 B1E8 6BCD 10A6" - (name "lle_bout")) ("8887 84C4 1459 ACCB 83E7 E84C 634C 6E89 79FA BEC2" (name "m1gu3l")) ("CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D" |