Jonathan Ringer d1d37feb6d Merge branch 'master' into staging-next ... Conflicts: pkgs/servers/x11/xorg/default.nix		2021-06-15 19:32:36 -07:00
..
scripts	maintainers/scripts/haskell: make commit messages more consistent	2021-06-06 18:53:56 +02:00
maintainer-list.nix	Merge branch 'master' into staging-next	2021-06-15 19:32:36 -07:00
team-list.nix	maintainers/teams: remove pacien from the matrix team	2021-06-06 16:08:22 +02:00