commit: 71cee0768615e55c18712aad6f4e1344ddd823f1
parent 30d65639c1bea2471752ed9c142ada63437f6d09
Author: lain <lain@soykaf.club>
Date: Tue, 13 Mar 2018 14:59:16 +0100
Merge branch 'andarna/pleroma-develop' into develop
Diffstat:
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
@@ -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
Binary files differ.
