Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop'
Resolve "Enable custom panel by default and have default content" Closes #146 See merge request pleroma/pleroma!124
This commit is contained in:
commit
d0b1c498a0
2 changed files with 3 additions and 2 deletions
|
@ -1,4 +1,5 @@
|
|||
<div style="margin-left:12px; margin-right:12px">
|
||||
<p>This is a <a href="https://pleroma.social" target="_blank">Pleroma</a> instance.</p>
|
||||
<p>Welcome to <a href="https://pleroma.social" target="_blank">Pleroma!</a></p>
|
||||
<p><a href="/main/all">Pleroma FE</a> | <a href="/web">Mastodon FE</a></p>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -4,5 +4,5 @@
|
|||
"logo": "/static/logo.png",
|
||||
"defaultPath": "/main/all",
|
||||
"chatDisabled": false,
|
||||
"showInstanceSpecificPanel": false
|
||||
"showInstanceSpecificPanel": true
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue