summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2021-02-26 10:25:13 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2021-02-26 10:25:13 +0100
commitc456a2512f7a7558cbe25328a423762033822cc0 (patch)
treed64f521751037012a1c4d05fedeb485eeee39b05 /maintainers
parentbabf9d6100c3e5dcdbbbe8850de99d3fe2b3cf86 (diff)
parent6d7128414cf2763ab14f31365c21c6cec3547dac (diff)
downloadnixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar
nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.gz
nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.bz2
nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.lz
nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.xz
nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.zst
nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.zip
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 9518b1c44b3..075d87b403f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7203,6 +7203,12 @@
     githubId = 157610;
     name = "Piotr Bogdan";
   };
+  pborzenkov = {
+    email = "pavel@borzenkov.net";
+    github = "pborzenkov";
+    githubId = 434254;
+    name = "Pavel Borzenkov";
+  };
   pblkt = {
     email = "pebblekite@gmail.com";
     github = "pblkt";