Merge staging-next into staging

2021-05-03 18:25:49 +00:00
parent 7b413bfff9 ab8749a05c
commit 5e177b16b1
60 changed files with 840 additions and 260 deletions
@@ -510,6 +510,7 @@
  ./services/misc/mame.nix
  ./services/misc/matrix-appservice-discord.nix
  ./services/misc/matrix-appservice-irc.nix
+  ./services/misc/matrix-dendrite.nix
  ./services/misc/matrix-synapse.nix
  ./services/misc/mautrix-telegram.nix
  ./services/misc/mbpfan.nix