Vladimír Čunát 5663b2b2d3 Merge branch 'master' into staging-next ... (a trivial conflict in transmission)		2021-05-09 09:31:55 +02:00
..
applications	Merge branch 'master' into staging-next	2021-05-09 09:31:55 +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 remote-tracking branch 'origin/master' into haskell-updates	2021-05-08 14:04:31 +02:00
desktops	Merge branch 'master' into staging-next	2021-05-09 09:31:55 +02:00
development	Merge branch 'master' into staging-next	2021-05-09 09:31:55 +02:00
games	Merge pull request #121911 from SFrijters/openttd-1.11.2	2021-05-09 00:59:24 -04:00
misc	Merge branch 'master' into staging-next	2021-05-09 09:31:55 +02:00
os-specific	Merge branch 'master' into staging-next	2021-05-09 09:31:55 +02:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2021-05-09 09:31:55 +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 branch 'master' into staging-next	2021-05-09 09:31:55 +02:00
top-level	Merge branch 'master' into staging-next	2021-05-09 09:31:55 +02:00