about summary refs log tree commit diff
path: root/maintainers/maintainer-list.nix
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2020-02-27 08:05:47 +0000
committerGitHub <noreply@github.com>2020-02-27 08:05:47 +0000
commitaa0b692fbe410c2ed6aa5d67c6e6b7f3716e259a (patch)
tree1aa1504e76d70244a574350346b3bae1890a7c6f /maintainers/maintainer-list.nix
parentcc05b65a9903d7284adad2786350be7399eca3ca (diff)
parent3d0626f9508ae670f9ae1c99b04b975f1e5ef23c (diff)
downloadnixlib-aa0b692fbe410c2ed6aa5d67c6e6b7f3716e259a.tar
nixlib-aa0b692fbe410c2ed6aa5d67c6e6b7f3716e259a.tar.gz
nixlib-aa0b692fbe410c2ed6aa5d67c6e6b7f3716e259a.tar.bz2
nixlib-aa0b692fbe410c2ed6aa5d67c6e6b7f3716e259a.tar.lz
nixlib-aa0b692fbe410c2ed6aa5d67c6e6b7f3716e259a.tar.xz
nixlib-aa0b692fbe410c2ed6aa5d67c6e6b7f3716e259a.tar.zst
nixlib-aa0b692fbe410c2ed6aa5d67c6e6b7f3716e259a.zip
Merge pull request #81162 from rissson/master
yubiaoth-desktop: 4.3.6 -> 5.0.2
Diffstat (limited to 'maintainers/maintainer-list.nix')
-rw-r--r--maintainers/maintainer-list.nix14
1 files changed, 14 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6141eb465115..6de84f4982df 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6087,6 +6087,20 @@
     githubId = 807447;
     name = "Robert Scott";
   };
+  risson = {
+    name = "Marc Schmitt";
+    email = "marc.schmitt@risson.space";
+    github = "rissson";
+    githubId = 18313093;
+    keys = [
+      { longkeyid = "rsa4096/0xF6FD87B15C263EC9";
+        fingerprint = "8A0E 6A7C 08AB B9DE 67DE  2A13 F6FD 87B1 5C26 3EC9";
+      }
+      { longkeyid = "ed25519/0xBBB7A6801DF1E03F";
+        fingerprint = "C0A7 A9BB 115B C857 4D75  EA99 BBB7 A680 1DF1 E03F";
+      }
+    ];
+  };
   rittelle = {
     email = "rittelle@posteo.de";
     github = "rittelle";