Skip to content
Commit 09d06f5f authored by Eelco Dolstra's avatar Eelco Dolstra
Browse files

Merge remote-tracking branch 'origin/master' into systemd-219 

Conflicts:
	pkgs/development/libraries/libseccomp/default.nix
parents f106125f a49afdf1
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