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

This commit is contained in:
Hakaba Hitoyo 2018-02-11 18:08:27 +09:00
commit 9cf293c84b
2 changed files with 6 additions and 1 deletions
priv/static
instance
static

View file

@ -0,0 +1,4 @@
<div style="margin-left:12px; margin-right:12px">
<p>This is a <a href="https://pleroma.social" target="_blank">Pleroma</a> instance.</p>
</div>

View file

@ -3,5 +3,6 @@
"background": "/static/bg.jpg",
"logo": "/static/logo.png",
"defaultPath": "/main/all",
"chatDisabled": false
"chatDisabled": false,
"showInstanceSpecificPanel": true
}