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
..
applications	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00
build-support	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00
common-updater
data	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00
desktops	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00
development	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00
games	Merge master into staging-next	2022-03-27 18:01:05 +00:00
misc	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00
os-specific	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00
shells	oh-my-zsh: 2022-03-26 -> 2022-03-28	2022-03-28 12:04:54 +00:00
stdenv	Merge master into staging-next	2022-03-26 12:01:14 +00:00
test	Merge master into staging-next	2022-03-25 18:01:14 +00:00
tools	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00
top-level	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00