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

Merge master into PR 

Conflicts:
	pkgs/top-level/all-packages.nix
parents 749e73af 29a79bb0
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