Skip to content
Commit 9c5e28e6 authored by Jonathan Glines's avatar Jonathan Glines
Browse files

Merge branch 'kochi-substitute' of github.com:/auntieNeo/nixpkgs into kochi-substitute 

Conflicts:
	pkgs/data/fonts/kochi-substitute/default.nix
parents 1a30cf5e 18b9aff6
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