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

Merge 'staging' 

Conflicts:
	pkgs/servers/x11/xorg/default.nix
parents 86a37268 0df6ccb4
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