Merge branch 'feature/instance-specific-panel' into 'develop'

add instance specific panel

See merge request pleroma/pleroma!66
This commit is contained in:
lambda 2018-02-11 09:32:48 +00:00
commit 1d52afe83e
2 changed files with 6 additions and 1 deletions

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", "background": "/static/bg.jpg",
"logo": "/static/logo.png", "logo": "/static/logo.png",
"defaultPath": "/main/all", "defaultPath": "/main/all",
"chatDisabled": false "chatDisabled": false,
"showInstanceSpecificPanel": true
} }