Jan Tojnar bfd44c17cd Merge branch 'master' into staging-next ... ; Conflicts: ; pkgs/top-level/aliases.nix		2022-02-04 19:54:59 +01:00
..
applications	Merge branch 'master' into staging-next	2022-02-04 19:54:59 +01:00
build-support	Merge remote-tracking branch 'origin/staging-next' into staging	2022-02-03 21:29:24 -08:00
common-updater
data	Merge branch 'master' into staging-next	2022-02-04 19:54:59 +01:00
desktops	Merge pull request #156994 from romildo/upd.mate-panel	2022-02-04 18:25:16 +01:00
development	Merge branch 'master' into staging-next	2022-02-04 19:54:59 +01:00
games
misc	vimPlugins.tup: fix ftdetect	2022-02-03 16:32:44 -08:00
os-specific	Merge branch 'master' into staging-next	2022-02-04 19:54:59 +01:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2022-02-04 19:54:59 +01:00
shells
stdenv
test
tools	Merge branch 'master' into staging-next	2022-02-04 19:54:59 +01:00
top-level	Merge branch 'master' into staging-next	2022-02-04 19:54:59 +01:00