Skip to content
Commit 6d724303 authored by Ian-Woo Kim's avatar Ian-Woo Kim
Browse files

Merge remote-tracking branch 'nixos/master' into proot 

Conflicts:
	pkgs/tools/system/proot/default.nix
parents 526b4d9f 4d246d00
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