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

Merge branch 'master' into staging

Conflicts (simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/top-level/all-packages.nix
parents 31810da3 64377277
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