Merge branch 'andarna/pleroma-develop' into develop

This commit is contained in:
lain 2018-03-13 14:59:16 +01:00
commit 71cee07686
2 changed files with 4 additions and 0 deletions

View File

@ -1,8 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang='en'> <html lang='en'>
<head> <head>
<title>
<%= Application.get_env(:pleroma, :instance)[:name] %>
</title>
<meta charset='utf-8'> <meta charset='utf-8'>
<meta content='width=device-width, initial-scale=1' name='viewport'> <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/common.css" />
<link rel="stylesheet" media="all" href="/packs/default.css" /> <link rel="stylesheet" media="all" href="/packs/default.css" />
<link rel="stylesheet" media="all" href="/packs/pl-dark-masto-fe.css" /> <link rel="stylesheet" media="all" href="/packs/pl-dark-masto-fe.css" />

BIN
priv/static/favicon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB