Merge branch 'develop' of github.com:diaspora/diaspora into develop

This commit is contained in:
Jonne Haß 2014-01-18 13:11:23 +01:00
commit ed971fc96d

View file

@ -2,7 +2,7 @@
<html>
<head>
<title>The page you were looking for doesn't exist (404)</title>
<link href="favicon.ico" rel="shortcut icon">
<link href="/favicon.ico" rel="shortcut icon">
<link href="/404.css" type="text/css" rel="stylesheet">
</head>
<body>