Vladimír Čunát 5effa4e0f9 Merge branch 'master' into staging-next ... Comments on conflicts: - llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is to build all targets, so we should be fine - some pypi hashes: they were equivalent, just base16 vs. base32		2019-02-01 09:22:29 +01:00
..
applications	Merge branch 'master' into staging-next	2019-02-01 09:22:29 +01:00
build-support	Merge branch 'master' into staging-next	2019-02-01 09:22:29 +01:00
common-updater
data	Merge branch 'master' into staging-next	2019-02-01 09:22:29 +01:00
desktops
development	Merge branch 'master' into staging-next	2019-02-01 09:22:29 +01:00
games	Merge pull request #53872 from Profpatsch/ankidocs	2019-01-30 13:45:12 -05:00
misc	vimPlugins: update (#54889)	2019-01-29 20:55:52 +01:00
os-specific	Merge branch 'master' into staging-next	2019-02-01 09:22:29 +01:00
servers	Merge pull request #54893 from nyanloutre/mautrix-telegram	2019-01-31 10:24:49 +01:00
shells
stdenv	Merge branch 'master' into staging-next	2019-02-01 09:22:29 +01:00
test
tools	Merge branch 'master' into staging-next	2019-02-01 09:22:29 +01:00
top-level	Merge branch 'master' into staging-next	2019-02-01 09:22:29 +01:00