From: Hakaba Hitoyo <example@example.com>
Date: Sun, 11 Feb 2018 09:08:27 +0000 (+0900)
Subject: Merge remote-tracking branch 'hakabahitoyo/feature/instance-specific-panel' into... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9cf293c84b68a5befa70f221fb49b4227e05dd51;p=akkoma

Merge remote-tracking branch 'hakabahitoyo/feature/instance-specific-panel' into feature/instance-specific-panel
---

9cf293c84b68a5befa70f221fb49b4227e05dd51
diff --cc priv/static/static/config.json
index 8e4b21cad,168fa0ff1..50bf888af
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@@@ -2,6 -2,9 +2,7 @@@
    "theme": "pleroma-dark",
    "background": "/static/bg.jpg",
    "logo": "/static/logo.png",
 -  "registrationOpen": true,
    "defaultPath": "/main/all",
-   "chatDisabled": false
+   "chatDisabled": false,
+   "showInstanceSpecificPanel": true
  }