diff options
author | makefu <github@syntax-fehler.de> | 2015-11-14 01:50:39 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-11-14 01:50:39 +0100 |
commit | a0fbe917ac45cda4de0f16bced3ce3ebfc556fe8 (patch) | |
tree | 44b66f4c43eeec674dcd763eb50141dd567c35e7 /lass/1systems/mors.nix | |
parent | 79b890670100d08c3640fffade2caf3eced192d8 (diff) | |
parent | ebba531273715c1a9c124007b97f3547d16e780f (diff) |
Merge remote-tracking branch 'cd/master' into pre-merge
Diffstat (limited to 'lass/1systems/mors.nix')
-rw-r--r-- | lass/1systems/mors.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index b0b8ff573..7db3f8333 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -156,6 +156,7 @@ get genid teamspeak_client + hashPassword ]; #TODO: fix this shit |