John Ericson c7ca42f44d Merge branch 'master' into staging		2017-09-19 15:14:52 -04:00
..
applications	slack: 2.7.1 -> 2.8.0 (#29339)	2017-09-19 12:26:58 -04:00
build-support	Merge branch 'master' into staging	2017-09-19 18:03:09 +02:00
common-updater
data	geolite-legacy: 2017-05-26 -> 2017-09-17	2017-09-18 21:55:41 +02:00
desktops	Merge pull request #29332 from romildo/fix.gnome-shell-extensions	2017-09-17 11:00:46 +00:00
development	Merge branch 'master' into staging	2017-09-19 18:03:09 +02:00
games	zandronum: fix soundfont support, minor cleanup	2017-09-15 23:08:47 -07:00
misc	clearlooks-phenix: 5.0.7 -> 7.0.1	2017-09-15 09:54:50 +02:00
os-specific	Merge branch 'master' into staging	2017-09-19 18:03:09 +02:00
servers	matterbridge: fix src hash	2017-09-18 23:24:48 +02:00
shells	grml-zsh-config: generalize support to unix systems	2017-09-01 11:38:38 +03:00
stdenv	stdenv: Add back leading '-' in cross derivation name suffix	2017-09-18 18:59:48 -04:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	Merge branch 'master' into staging	2017-09-19 18:03:09 +02:00
top-level	Merge branch 'master' into staging	2017-09-19 15:14:52 -04:00