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

Merge master into x-updates 

Conflicts (auto-solved):
	pkgs/os-specific/linux/alsa-plugins/default.nix
parents 219cae44 ca545ac8
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