Merge remote-tracking branch 'origin/released' into next

2018-03-17 08:02:36 -04:00 · 2018-03-17 08:02:36 -04:00 · fefc1ec984
parent ba8f8ecce4 d46a2ce2e5
commit fefc1ec984
2 changed files with 7 additions and 1 deletions
--- a/config.extra-known-users.json
+++ b/config.extra-known-users.json
@ -2,10 +2,14 @@
    "bhipple",
    "dywedir",
    "edef1c",
+    "Ekleog",
+    "Ma27",
    "oxij",
    "pbogdan",
    "teto",
    "ThomasMader",
    "unode",
-    "xeji"
+    "va1entin",
+    "xeji",
+    "volth"
 ]
--- a/config.public.json
+++ b/config.public.json
@ -40,10 +40,12 @@
            "lheckemann",
            "lnl7",
            "makefu",
+            "matthiasbeyer",
            "mic92",
            "nequissimus",
            "orivej",
            "peti",
+            "rasendubi",
            "rbvermaa",
            "romildo",
            "rnhmjoj",