Merge master into staging-next

2021-02-20 18:17:10 +00:00
parent 5884dca2b9 6d771e5330
commit 7a1ee9c317
13 changed files with 188 additions and 59 deletions
@@ -82,6 +82,12 @@
    githubId = 882455;
    name = "Elliot Cameron";
  };
+  _414owen = {
+    email = "owen@owen.cafe";
+    github = "414owen";
+    githubId = 1714287;
+    name = "Owen Shepherd";
+  };
  _6AA4FD = {
    email = "f6442954@gmail.com";
    github = "6AA4FD";