Skip to content
Commit 16b45ec3 authored by Tuomas Tynkkynen's avatar Tuomas Tynkkynen
Browse files

Merge remote-tracking branch 'upstream/master' into HEAD 

Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/unix-tools.nix
parents c0e58f80 333a24a6
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