Jan Tojnar 997bb5e42c Merge branch 'master' into staging-next ... ; Conflicts: ; pkgs/development/python-modules/dnspython/default.nix ; pkgs/development/python-modules/googleapis-common-protos/default.nix		2022-03-28 17:55:31 +02:00
..
scripts	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00
maintainer-list.nix	Merge pull request #151705 from uakci/mplus-add-github-release	2022-03-28 13:40:32 +02:00
team-list.nix	Merge pull request #163322 from Atemu/remove-chia-maintainer	2022-03-08 17:28:13 +00:00