Skip to content
Snippets Groups Projects
Commit f0ef6b74 authored by Eelco Dolstra's avatar Eelco Dolstra
Browse files

Merge branch 'master' of github.com:thatdocslady/nix 

Conflicts:
	doc/manual/release-notes.xml
	doc/manual/writing-nix-expressions.xml
parents 67e5dd3c 8901acc9
Hide whitespace changes
Inline Side-by-side
Showing
with 131 additions and 52 deletions
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