summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-06-28 01:21:21 +0200
committerGitHub <noreply@github.com>2020-06-28 01:21:21 +0200
commitc0c786c3bd13c44b469002071c437c1e6b1ae2ff (patch)
tree2ac29961677db664ce03719b70bb3325e758a430 /maintainers
parent569d2965febf8baedff83a1699044fa179e07482 (diff)
parentfc120e64369e190b864b816bb46b7e8932aea163 (diff)
downloadnixpkgs-c0c786c3bd13c44b469002071c437c1e6b1ae2ff.tar
nixpkgs-c0c786c3bd13c44b469002071c437c1e6b1ae2ff.tar.gz
nixpkgs-c0c786c3bd13c44b469002071c437c1e6b1ae2ff.tar.bz2
nixpkgs-c0c786c3bd13c44b469002071c437c1e6b1ae2ff.tar.lz
nixpkgs-c0c786c3bd13c44b469002071c437c1e6b1ae2ff.tar.xz
nixpkgs-c0c786c3bd13c44b469002071c437c1e6b1ae2ff.tar.zst
nixpkgs-c0c786c3bd13c44b469002071c437c1e6b1ae2ff.zip
Merge pull request #91454 from ConradMearns/obsidian
obsidian: init at 0.7.3
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 e8e2eff26c8..1830d7087e6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1604,6 +1604,12 @@
     githubId = 32609395;
     name = "B YI";
   };
+  conradmearns = {
+    email = "conradmearns+github@pm.me";
+    github = "ConradMearns";
+    githubId = 5510514;
+    name = "Conrad Mearns";
+  };
   couchemar = {
     email = "couchemar@yandex.ru";
     github = "couchemar";