diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-09 12:28:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-09 12:28:52 +0200 |
| commit | d3afcac771d86e9e3c482a8564513ab1a72b87e5 (patch) | |
| tree | f002f6e54b1d505c7d1ac4fadc648ce6e2bb3b81 /nixos/modules/module-list.nix | |
| parent | 480cd436fc077c60e86fccd68d5971dc831f5947 (diff) | |
| parent | e596a33dc08b9b7d34aa62c0418218de7469ae7f (diff) | |
| download | nixlib-d3afcac771d86e9e3c482a8564513ab1a72b87e5.tar nixlib-d3afcac771d86e9e3c482a8564513ab1a72b87e5.tar.gz nixlib-d3afcac771d86e9e3c482a8564513ab1a72b87e5.tar.bz2 nixlib-d3afcac771d86e9e3c482a8564513ab1a72b87e5.tar.lz nixlib-d3afcac771d86e9e3c482a8564513ab1a72b87e5.tar.xz nixlib-d3afcac771d86e9e3c482a8564513ab1a72b87e5.tar.zst nixlib-d3afcac771d86e9e3c482a8564513ab1a72b87e5.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/module-list.nix')
| -rw-r--r-- | nixos/modules/module-list.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1017d25bf285..bf2716d6caee 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -611,6 +611,7 @@ ./services/networking/morty.nix ./services/networking/miredo.nix ./services/networking/mstpd.nix + ./services/networking/mtprotoproxy.nix ./services/networking/murmur.nix ./services/networking/mxisd.nix ./services/networking/namecoind.nix @@ -759,6 +760,7 @@ ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix ./services/web-apps/codimd.nix + ./services/web-apps/cryptpad.nix ./services/web-apps/documize.nix ./services/web-apps/frab.nix ./services/web-apps/icingaweb2/icingaweb2.nix |