Merge branch 'staging-next' into staging

Resolved the following conflicts: - kernel flags between 09176d28a0 and 2b28822d8d - clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
parent c34b032ccb e4f96ad7d9
commit 8f50f1ce10
62 changed files with 454 additions and 163 deletions
@@ -2103,6 +2103,12 @@
    email = "christoph.senjak@googlemail.com";
    name = "Christoph-Simon Senjak";
  };
+  davhau = {
+    email = "d.hauer.it@gmail.com";
+    name = "David Hauer";
+    github = "DavHau";
+    githubId = 42246742;
+  };
  david-sawatzke = {
    email = "d-nix@sawatzke.dev";
    github = "david-sawatzke";