aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-03-13 14:59:16 +0100
committerlain <lain@soykaf.club>2018-03-13 14:59:16 +0100
commit71cee0768615e55c18712aad6f4e1344ddd823f1 (patch)
tree1452a32fcec7e17c49b478051b64c1e3b4e31e33
parent30d65639c1bea2471752ed9c142ada63437f6d09 (diff)
parent2b2fa94e9445185060ce1704a67b0f8e43e9ef2d (diff)
downloadpleroma-71cee0768615e55c18712aad6f4e1344ddd823f1.tar.gz
Merge branch 'andarna/pleroma-develop' into develop
-rw-r--r--lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex4
-rw-r--r--priv/static/favicon.pngbin0 -> 2411 bytes
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex b/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex
index ac50ad46b..f96b15d64 100644
--- 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" />
diff --git a/priv/static/favicon.png b/priv/static/favicon.png
new file mode 100644
index 000000000..f83d923bb
--- /dev/null
+++ b/priv/static/favicon.png
Binary files differ