diff options
| author | lain <lain@soykaf.club> | 2018-04-21 18:28:24 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-04-21 18:28:24 +0200 |
| commit | 26af5bad338b9c40918964379c6bb9916ca8b066 (patch) | |
| tree | 200d92d654748db60a8ca98d100e91ad160b397d /priv | |
| parent | 0c221943ef588df195a0e36da4d95e164e3094f2 (diff) | |
| parent | d0b1c498a0c294e99160c01e8e43d6891b1922bc (diff) | |
| download | pleroma-26af5bad338b9c40918964379c6bb9916ca8b066.tar.gz pleroma-26af5bad338b9c40918964379c6bb9916ca8b066.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/static/instance/panel.html | 3 | ||||
| -rw-r--r-- | priv/static/static/config.json | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/priv/static/instance/panel.html b/priv/static/instance/panel.html index ae9647837..7e73e4824 100644 --- a/priv/static/instance/panel.html +++ b/priv/static/instance/panel.html @@ -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> diff --git a/priv/static/static/config.json b/priv/static/static/config.json index 9863ec024..797f03377 100644 --- a/priv/static/static/config.json +++ b/priv/static/static/config.json @@ -4,5 +4,5 @@ "logo": "/static/logo.png", "defaultPath": "/main/all", "chatDisabled": false, - "showInstanceSpecificPanel": false + "showInstanceSpecificPanel": true } |