zimbatm 7e66125815 Merge pull request #87068 from kampka/kops ... kops: 1.15.2 -> 1.15.3 and 1.16.1 -> 1.16.2		2020-05-06 10:54:33 +02:00
..
applications	Merge pull request #87068 from kampka/kops	2020-05-06 10:54:33 +02:00
build-support	Merge master into staging-next	2020-05-05 19:51:09 +02:00
common-updater
data	Merge master into staging-next	2020-05-05 19:51:09 +02:00
desktops	Merge master into staging-next	2020-05-05 19:51:09 +02:00
development	ocamlPackages.owl: unbreak by reversing previous edits	2020-05-06 09:21:58 +02:00
games	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00
misc	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00
os-specific	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00
servers	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00
shells	Merge pull request #86938 from marsam/update-xonsh	2020-05-05 15:17:27 +01:00
stdenv	mkDerivation mesonFlags: Fix arm cpu families	2020-04-28 22:56:20 -04:00
test
tools	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00
top-level	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00