Merge branch 'andarna/pleroma-develop' into develop

2018-03-13 14:59:16 +01:00 · 2018-03-13 14:59:16 +01:00 · 71cee07686
commit 71cee07686
parent 30d65639c1 2b2fa94e94
2 changed files with 4 additions and 0 deletions
--- a/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex
+++ b/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex
@ -1,8 +1,12 @@
 <!DOCTYPE html>
 <html lang='en'>
 <head>
+<title>
+<%= Application.get_env(:pleroma, :instance)[:name] %>
+</title>
 <meta charset='utf-8'>
 <meta content='width=device-width, initial-scale=1' name='viewport'>
+<link rel="icon" type="image/png" href="/favicon.png"/>
 <link rel="stylesheet" media="all" href="/packs/common.css" />
 <link rel="stylesheet" media="all" href="/packs/default.css" />
 <link rel="stylesheet" media="all" href="/packs/pl-dark-masto-fe.css" />
--- a/priv/static/favicon.png
+++ b/priv/static/favicon.png