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
@@ -135,6 +135,7 @@ with lib.maintainers; {
      mguentner
      ekleog
      ralith
+      mjlbach
    ];
    scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
  };