Jan Tojnar 4e7e464ae8 Merge branch 'master' into staging-next ... ; Conflicts: ; pkgs/tools/system/sg3_utils/default.nix		2021-08-11 16:22:42 +02:00
..
applications	Merge branch 'master' into staging-next	2021-08-11 16:22:42 +02:00
build-support
common-updater
data
desktops	Merge pull request #131311 from bobby285271/mutter	2021-08-11 15:46:47 +02:00
development	Merge branch 'master' into staging-next	2021-08-11 16:22:42 +02:00
games	Merge pull request #133434 from nagy/ioquake3	2021-08-11 10:49:53 +02:00
misc	Merge pull request #133272 from figsoda/bufdelete.nvim	2021-08-11 13:16:37 +02:00
os-specific	Merge branch 'master' into staging-next	2021-08-11 16:22:42 +02:00
pkgs-lib
servers	Merge pull request #133503 from justinas/teleport-7	2021-08-11 16:16:57 +02:00
shells
stdenv
test
tools	Merge branch 'master' into staging-next	2021-08-11 16:22:42 +02:00
top-level	Merge branch 'master' into staging-next	2021-08-11 16:22:42 +02:00