Merge branch 'master' into staging

2019-09-02 23:25:24 +02:00
parent b291f2a995 12ae04518b
commit f21211ebfe
277 changed files with 4766 additions and 1895 deletions
@@ -5095,6 +5095,12 @@
    githubId = 9568176;
    name = "Piotr Halama";
  };
+  puckipedia = {
+    email = "puck@puckipedia.com";
+    github = "puckipedia";
+    githubId = 488734;
+    name = "Puck Meerburg";
+  };
  puffnfresh = {
    email = "brian@brianmckenna.org";
    github = "puffnfresh";