diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:13:53 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:13:53 +0300 |
| commit | 4ff8f377afcfcb206c585f165dc1332c9fb1eba1 (patch) | |
| tree | 2df363c4be265610f3982377b3a1dc61870a544a /nixos/modules/module-list.nix | |
| parent | 7ac1ef05fa162d8e3c35925034df72288df77c8b (diff) | |
| parent | 49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4 (diff) | |
| download | nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.gz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.bz2 nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.lz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.xz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.zst nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'nixos/modules/module-list.nix')
| -rw-r--r-- | nixos/modules/module-list.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b238003dd0ca..ec14fd2e3631 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -338,6 +338,7 @@ ./services/networking/kippo.nix ./services/networking/lambdabot.nix ./services/networking/libreswan.nix + ./services/networking/logmein-hamachi.nix ./services/networking/mailpile.nix ./services/networking/mfi.nix ./services/networking/mjpg-streamer.nix |