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
..
appdaemon.nix	appdaemon: init at 3.0.0b4	2018-03-04 23:43:05 +01:00
component-packages.nix	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
default.nix	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
frontend.nix	home-assistant: 0.63.3 -> 0.65.5	2018-03-15 15:03:36 +01:00
parse-requirements.py	home-assistant: sort components when writing them out	2018-02-27 17:15:26 +08:00