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

Merge master into stdenv-updates 

Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
parents 177667ee 8088837d
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