alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
lambda 2018-04-21 08:05:36 +00:00
parent b7669c6efe 90ad55b8ff
commit d0b1c498a0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
priv/static/instance/panel.html
View File

@ -1,4 +1,5 @@
<div style="margin-left:12px; margin-right:12px"> <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> </div>

2
priv/static/static/config.json
View File

@ -4,5 +4,5 @@
"logo": "/static/logo.png", "logo": "/static/logo.png",
"defaultPath": "/main/all", "defaultPath": "/main/all",
"chatDisabled": false, "chatDisabled": false,
"showInstanceSpecificPanel": false "showInstanceSpecificPanel": true
} }