diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 12:51:57 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 13:11:40 -0400 |
| commit | 5e2140511c1ad9ccd731438b74d61b62111da1e6 (patch) | |
| tree | a4ff748ad26e121b88469b5d921001ef1382be8f /.guix-authorizations | |
| parent | 9e3a5ee417ea7fe9721be8804ff047e80c4f22ed (diff) | |
| parent | 353bdae32f72b720c7ddd706576ccc40e2b43f95 (diff) | |
| download | guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar.gz | |
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
Diffstat (limited to '.guix-authorizations')
| -rw-r--r-- | .guix-authorizations | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.guix-authorizations b/.guix-authorizations index ee164083c8..fc52e3fc19 100644 --- a/.guix-authorizations +++ b/.guix-authorizations @@ -1,5 +1,5 @@ -;; This is the list of OpenPGP keys currently authorized to sign commits in -;; this repository. +;; This file, which is best viewed as -*- Scheme -*-, lists the OpenPGP keys +;; currently authorized to sign commits in this repository. (authorizations (version 0) @@ -84,6 +84,8 @@ (name "lfam")) ("2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC" (name "lsl88")) + ("8887 84C4 1459 ACCB 83E7 E84C 634C 6E89 79FA BEC2" + (name "m1gu3l")) ("CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D" (name "marusich")) ("BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA" |