about summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2019-01-16 08:15:14 +0000
committerGitHub <noreply@github.com>2019-01-16 08:15:14 +0000
commitfd5b4eeb19154efd00195fac9f79583a4562ba1e (patch)
treea07e35b8d1cd5b798ef0fc7c1aef7b815d07ffa2 /maintainers
parent004b908ae6ececca2743894e3bf6e69a39e3b684 (diff)
parentefe4a6d205cd8f000240316b5bc328933222254b (diff)
downloadnixlib-fd5b4eeb19154efd00195fac9f79583a4562ba1e.tar
nixlib-fd5b4eeb19154efd00195fac9f79583a4562ba1e.tar.gz
nixlib-fd5b4eeb19154efd00195fac9f79583a4562ba1e.tar.bz2
nixlib-fd5b4eeb19154efd00195fac9f79583a4562ba1e.tar.lz
nixlib-fd5b4eeb19154efd00195fac9f79583a4562ba1e.tar.xz
nixlib-fd5b4eeb19154efd00195fac9f79583a4562ba1e.tar.zst
nixlib-fd5b4eeb19154efd00195fac9f79583a4562ba1e.zip
Merge pull request #53380 from HaoZeke/updateConan
conan: 1.6.0 -> 1.11.2
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f3c54d3ceb1c..35a1296db5a9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1759,6 +1759,11 @@
     email = "commits@schurr.at";
     github = "hansjoergschurr";
     name = "Hans-Jörg Schurr";
+    };
+  HaoZeke = {
+    email = "r95g10@gmail.com";
+    github = "haozeke";
+    name = "Rohit Goswami";
   };
   haslersn = {
     email = "haslersn@fius.informatik.uni-stuttgart.de";