Merge branch 'master' into nixos-nixpkgs-pkgs-use-overlays

This commit is contained in:
Robert Hensing 2018-11-04 14:19:33 +01:00 committed by GitHub
commit 03fc1167e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
622 changed files with 20016 additions and 14237 deletions

View file

@ -331,6 +331,9 @@
zeronet = 304;
lirc = 305;
lidarr = 306;
slurm = 307;
kapacitor = 308;
solr = 309;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -622,6 +625,9 @@
zeronet = 304;
lirc = 305;
lidarr = 306;
slurm = 307;
kapacitor = 308;
solr = 309;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal