diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
| commit | 9dea3f101f252331c049c03f501398a5ec837ba9 (patch) | |
| tree | 61d683a9fae3e147332d07fef207c1ddf51fc301 /.guix-authorizations | |
| parent | 7f0af119a1e3ea9d0ae53811b619437b3e942702 (diff) | |
| parent | 620669fd17306c2edb21c64a99fa47160fefb319 (diff) | |
| download | guix-9dea3f101f252331c049c03f501398a5ec837ba9.tar.gz guix-9dea3f101f252331c049c03f501398a5ec837ba9.zip | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/cups.scm
gnu/packages/python-web.scm
gnu/packages/web.scm
guix/build/maven/pom.scm
Diffstat (limited to '.guix-authorizations')
| -rw-r--r-- | .guix-authorizations | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.guix-authorizations b/.guix-authorizations index fff75fb6d1..83606675c5 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")) |