diff options
| author | Shpuld Shpuldson <shpuld@shpposter.club> | 2020-01-13 23:47:32 +0200 |
|---|---|---|
| committer | Shpuld Shpuldson <shpuld@shpposter.club> | 2020-01-13 23:47:32 +0200 |
| commit | b32888194c2b9de286bcfff9998dae009cea224d (patch) | |
| tree | eb907b6457bc6416c9a8661039848aebf8f1727a /index.html | |
| parent | 33abbed5a1e1d1cf99d21d481b2a22481d7533b2 (diff) | |
| parent | 7257189ea796d51117285814d32ed6138fdb3458 (diff) | |
fix merge conflicts
Diffstat (limited to 'index.html')
| -rw-r--r-- | index.html | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -6,8 +6,6 @@ <title>Pleroma</title> <!--server-generated-meta--> <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> <body class="hidden"> <noscript>To use Pleroma, please enable JavaScript.</noscript> |