Merge branch 'master' into staging-next

2021-05-14 22:27:34 +02:00
parent 55282bd6f6 cc2fc35667
commit c48eaa70e3
64 changed files with 1924 additions and 1438 deletions
@@ -91,6 +91,7 @@ in
  custom-ca = handleTest ./custom-ca.nix {};
  croc = handleTest ./croc.nix {};
  deluge = handleTest ./deluge.nix {};
+  dendrite = handleTest ./dendrite.nix {};
  dhparams = handleTest ./dhparams.nix {};
  discourse = handleTest ./discourse.nix {};
  dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {};