Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
..
2018-01-25 13:58:14 -08:00
2016-04-22 03:58:08 +02:00
2017-12-29 02:18:35 +01:00
2018-02-23 18:51:39 +03:00
2018-03-10 20:38:13 +00:00