Merge branch 'develop' into 'develop'

Add favicon to pleroma-fe

See merge request pleroma/pleroma-fe!248
This commit is contained in:
lambda 2018-05-03 16:53:32 +00:00
commit e341354cc7

View file

@ -4,6 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Pleroma</title>
<link rel="icon" type="image/png" href="/favicon.png">
<link rel="stylesheet" href="/static/font/css/fontello.css">
<link rel="stylesheet" href="/static/font/css/animation.css">
</head>