Martin Weinelt 4bfe4794fa Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: - pkgs/development/python-modules/rich/default.nix - pkgs/servers/mautrix-facebook/default.nix - pkgs/servers/mautrix-googlechat/default.nix - pkgs/servers/mautrix-signal/default.nix - pkgs/top-level/python-aliases.nix		2023-03-12 19:23:32 +01:00
..
applications	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 19:23:32 +01:00
build-support	Merge branch 'master' into staging-next	2023-03-12 09:06:28 +01:00
common-updater
data	Merge master into staging-next	2023-03-12 12:01:31 +00:00
desktops	Merge master into staging-next	2023-03-12 12:01:31 +00:00
development	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 19:23:32 +01:00
games	anki: Add mock to check inputs	2023-03-12 19:13:10 +01:00
misc	Merge master into staging-next	2023-03-11 12:01:11 +00:00
os-specific	Merge branch 'master' into staging-next	2023-03-12 17:21:00 +01:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 19:23:32 +01:00
shells	Merge branch 'master' into staging-next	2023-03-12 09:06:28 +01:00
stdenv	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-10 13:09:25 +01:00
test	Merge branch 'master' into staging-next	2023-03-12 09:06:28 +01:00
tools	awslogs: Fix illegal version specifier in python_requires	2023-03-12 19:15:23 +01:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 19:23:32 +01:00