Frederik Rietdijk 59dda0a42a Merge master into staging-next		2020-06-15 08:07:00 +02:00
..
applications	Merge master into staging-next	2020-06-15 08:07:00 +02:00
build-support	Merge master into staging-next	2020-06-13 11:02:21 +02:00
common-updater
data	fira-code: 5 -> 5.2	2020-06-14 14:39:46 +02:00
desktops	treewide: use ffmpeg_3 explicitly if not wanted otherwise	2020-06-12 11:55:31 -07:00
development	Merge master into staging-next	2020-06-15 08:07:00 +02:00
games	treewide: use ffmpeg_3 explicitly if not wanted otherwise	2020-06-12 11:55:31 -07:00
misc	Merge master into staging-next	2020-06-15 08:07:00 +02:00
os-specific	Merge master into staging-next	2020-06-15 08:07:00 +02:00
servers	Merge master into staging-next	2020-06-13 11:02:21 +02:00
shells	oh-my-zsh: 2020-06-08 -> 2020-06-10	2020-06-12 10:13:32 -04:00
stdenv	stdenv/check-meta: alignment/width	2020-06-11 12:35:11 +10:00
test
tools	Merge master into staging-next	2020-06-15 08:07:00 +02:00
top-level	Merge master into staging-next	2020-06-15 08:07:00 +02:00