Merge staging-next into staging

2021-05-02 18:24:58 +00:00
parent da64b5289b 03120b685d
commit 0e4580d4d0
32 changed files with 4090 additions and 231 deletions
@@ -2177,6 +2177,12 @@
    githubId = 990767;
    name = "Daniel Olsen";
  };
+  daneads = {
+    email = "me@daneads.com";
+    github = "daneads";
+    githubId = 24708079;
+    name = "Dan Eads";
+  };
  danharaj = {
    email = "dan@obsidian.systems";
    github = "danharaj";