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-02-19 11:19:32 -06:00
2018-02-19 11:19:32 -06:00
2018-02-19 11:19:32 -06:00
2017-06-27 09:05:37 -05:00
2018-03-07 17:38:15 -06:00
2017-06-27 09:05:37 -05:00
2018-03-14 20:04:38 -05:00