Dmitry Kalinkin 889227a048 Merge branch 'master' into staging-next ... Conflicts: pkgs/development/python-modules/pdftotext/default.nix		2021-12-16 16:55:25 -05:00
..
applications	Merge branch 'master' into staging-next	2021-12-16 16:55:25 -05:00
build-support	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-15 11:30:31 +01:00
common-updater
data	Merge branch 'master' into staging-next	2021-12-16 16:55:25 -05:00
desktops	Merge pull request #150792 from bobby285271/pantheon	2021-12-15 11:29:08 +08:00
development	Merge branch 'master' into staging-next	2021-12-16 16:55:25 -05:00
games	Merge pull request #149814 from fgaz/gnonograms/2.0.0	2021-12-16 22:12:02 +08:00
misc	Merge branch 'master' into staging-next	2021-12-16 16:55:25 -05:00
os-specific	Merge branch 'master' into staging-next	2021-12-16 16:55:25 -05:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2021-12-16 16:55:25 -05:00
shells	oh-my-zsh: 2021-12-13 -> 2021-12-13	2021-12-15 09:11:02 +00:00
stdenv
test
tools	Merge branch 'master' into staging-next	2021-12-16 16:55:25 -05:00
top-level	Merge branch 'master' into staging-next	2021-12-16 16:55:25 -05:00