Skip to content
Commit 7b768ba2 authored by Alex Berg's avatar Alex Berg
Browse files

Merge remote-tracking branch 'nixos/master' into feature/add-znc-module 

Conflicts:
	nixos/modules/misc/ids.nix
parents 9af1e2ab a391b55b
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