summaryrefslogtreecommitdiffstats
path: root/maintainers
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-01-27 00:43:20 +0000
committerGitHub <noreply@github.com>2021-01-27 00:43:20 +0000
commit715dd567c8c605a326a8fca54766ec5a172ba4b9 (patch)
tree102d7ac56e02d16870ca9292d42629e684a48c75 /maintainers
parentc994c9d31e2ba478aa50a9d4b0d9cba6e25b27f5 (diff)
parentebc22e9921fbcc66ce4c4711e79ba5eb1cc01495 (diff)
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2887f3c62f2e..f25f11f57aec 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4943,6 +4943,12 @@
githubId = 4032;
name = "Kristoffer Thømt Ravneberg";
};
+ kritnich = {
+ email = "kritnich@kritni.ch";
+ github = "Kritnich";
+ githubId = 22116767;
+ name = "Kritnich";
+ };
kroell = {
email = "nixosmainter@makroell.de";
github = "rokk4";