Merge remote-tracking branch 'upstream/master' into staging

2018-12-16 22:55:06 +01:00
parent 4027966602 eceb2b06a1
commit aead6e12f9
524 changed files with 14889 additions and 12120 deletions
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -715,7 +715,6 @@
  ./services/web-apps/restya-board.nix
  ./services/web-apps/tt-rss.nix
  ./services/web-apps/selfoss.nix
-  ./services/web-apps/quassel-webserver.nix
  ./services/web-apps/virtlyst.nix
  ./services/web-apps/youtrack.nix
  ./services/web-servers/apache-httpd/default.nix