Jonathan Ringer fc25d94010 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/python-modules/jupyter-client/default.nix pkgs/development/python-modules/jupyterlab-git/default.nix		2021-10-22 09:33:07 -07:00
..
applications	Merge remote-tracking branch 'origin/master' into staging-next	2021-10-22 09:33:07 -07:00
build-support	Merge remote-tracking branch 'origin/master' into staging-next	2021-10-22 09:33:07 -07:00
common-updater
data	Merge remote-tracking branch 'origin/master' into staging-next	2021-10-22 09:33:07 -07:00
desktops	Merge pull request #142455 from bobby285271/fileroller	2021-10-22 16:21:45 +02:00
development	Merge remote-tracking branch 'origin/master' into staging-next	2021-10-22 09:33:07 -07:00
games	Merge pull request #141927 from helsinki-systems/upd/scummvm	2021-10-21 02:05:57 +02:00
misc	Merge remote-tracking branch 'origin/master' into staging-next	2021-10-22 09:33:07 -07:00
os-specific	Merge remote-tracking branch 'origin/master' into staging-next	2021-10-22 09:33:07 -07:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/master' into staging-next	2021-10-22 09:33:07 -07:00
shells	Merge pull request #142533 from legendofmiracles/hilbish	2021-10-22 10:13:18 -04:00
stdenv
test
tools	Merge remote-tracking branch 'origin/master' into staging-next	2021-10-22 09:33:07 -07:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2021-10-22 09:33:07 -07:00