Skip to content
Commit ef64208e authored by Tuomas Tynkkynen's avatar Tuomas Tynkkynen
Browse files

Merge commit '3ab2949e' from staging into master 

Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
parents 208abe9a 3ab2949e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment