Skip to content
Commit a46d2e31 authored by Shea Levy's avatar Shea Levy
Browse files

Merge branch 'murmur' of git://github.com/thoughtpolice/nixpkgs 

nixos: add Murmur module (Mumble chat)

Conflicts:
	nixos/modules/misc/ids.nix
parents bd1a95ee 788354cc
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