Merge staging-next into staging

2021-02-20 06:17:59 +00:00
parent abe7db36a4 f22bc6d555
commit 4c0670dace
23 changed files with 343 additions and 95 deletions
@@ -9324,7 +9324,7 @@
    name = "Jan Beinke";
  };
  thesola10 = {
-    email = "thesola10@bobile.fr";
+    email = "me@thesola.io";
    github = "thesola10";
    githubId = 7287268;
    keys = [{