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

Merge branch 'master' into x-updates 

Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
parents 6a29a56c 50d66b94
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