Skip to content
Commit dbae4f10 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into staging 

Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
parents 5dab6258 b50cabf2
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