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-09 19:51:06 +00:00
2017-09-29 15:18:25 +01:00
2017-08-11 15:48:45 +00:00
2017-01-29 05:45:43 -06:00
2017-01-29 05:45:43 -06:00
2017-09-23 20:34:55 +02:00
2017-08-25 14:08:11 +02:00
2017-07-23 12:56:04 +03:00
2018-03-12 15:13:31 +11:00
2017-09-29 15:01:21 +01:00
2018-02-09 19:51:06 +00:00
2018-01-04 09:58:21 +01:00