Merge staging-next into staging

2019-08-31 18:07:33 +02:00
parent 92b96ce63f 96e5474329
commit 98ef78326d
40 changed files with 801 additions and 381 deletions
@@ -1822,6 +1822,12 @@
    githubId = 18535642;
    name = "Emily";
  };
+  endocrimes = {
+    email = "dani@builds.terrible.systems";
+    github = "endocrimes";
+    githubId = 1330683;
+    name = "Danielle Lancashire";
+  };
  ederoyd46 = {
    email = "matt@ederoyd.co.uk";
    github = "ederoyd46";