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

Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs 

systemd: python support & journal http gateway

Conflicts:
	nixos/modules/misc/ids.nix
parents 8502d84b 616b4b5b
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