Skip to content
Unverified Commit af8cd3c7 authored by Pascal Wittmann's avatar Pascal Wittmann
Browse files

Merge branch 'master' into add-missing-licenses 

 Conflicts:
	pkgs/applications/version-management/subversion/default.nix
parents 8915ed06 1d4de0d5
Expand all 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