Merge release-21.05 into staging-next-21.05

2021-07-10 00:02:34 +00:00
parent 86455fbb91 8b5fcedfc9
commit 9b0fff08dc
7 changed files with 49 additions and 14 deletions
@@ -19104,6 +19104,8 @@ in

  jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { };

+  jitsi-meet-prosody = callPackage ../misc/jitsi-meet-prosody { };
+
  jitsi-videobridge = callPackage ../servers/jitsi-videobridge { };

  kapowbang = callPackage ../servers/kapowbang { };