Martin Weinelt 9651084620 Merge remote-tracking branch 'origin/master' into staging-next		2021-05-08 14:43:43 +02:00
..
applications	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-08 14:43:43 +02:00
build-support	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-08 14:43:43 +02:00
common-updater
data	Merge #121780: treewide meta.maintainers tweaks	2021-05-08 10:47:08 +02:00
desktops	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-08 14:43:43 +02:00
development	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-08 14:43:43 +02:00
games	alephone-infinity: 20200904 -> 20210408	2021-05-08 10:06:10 +02:00
misc	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-08 14:43:43 +02:00
os-specific	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-08 14:43:43 +02:00
pkgs-lib	formats.ini: Introduce listToValue argument (#121613)	2021-05-04 09:49:25 +02:00
servers	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-08 14:43:43 +02:00
shells	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-08 14:43:43 +02:00
stdenv	Merge remote-tracking branch 'upstream/staging-next' into staging	2021-05-06 15:48:25 -04:00
test	Merge branch 'master' into haskell-updates	2021-05-07 15:03:54 +02:00
tools	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-08 14:43:43 +02:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-08 14:43:43 +02:00