Jan Tojnar f94f861942 haskellPackages.bustle: fix build		2018-07-22 16:43:57 +02:00
..
applications	parity-ui: fix after merge	2018-07-22 12:13:14 +02:00
build-support	Merge branch 'master' into unused5	2018-07-21 15:41:22 +01:00
common-updater
data	Merge staging-next into master	2018-07-22 11:04:28 +02:00
desktops	Merge staging-next into master	2018-07-22 11:04:28 +02:00
development	haskellPackages.bustle: fix build	2018-07-22 16:43:57 +02:00
games	Merge staging-next into master	2018-07-22 11:04:28 +02:00
misc	lollypop-portal: add version	2018-07-22 06:25:56 -04:00
os-specific	batman-adv: 2018.1 -> 2018.2	2018-07-22 11:16:22 +02:00
servers	Merge staging-next into master	2018-07-22 11:04:28 +02:00
shells	Merge pull request #43912 from r-ryantm/auto-update/powershell	2018-07-22 08:44:38 +02:00
stdenv	Merge master into staging-next	2018-07-21 19:43:53 +02:00
test	tests: add some cross tests	2018-07-21 17:00:05 -04:00
tools	zimwriterfs: meta.platforms is a list	2018-07-22 16:39:05 +02:00
top-level	Merge staging-next into master	2018-07-22 11:04:28 +02:00