diff options
| author | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 21:00:40 +0100 |
|---|---|---|
| committer | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 21:00:40 +0100 |
| commit | dec23500d8988c22a99f049ef1d1e49328ba075a (patch) | |
| tree | a6e16c5fa60b02058b1ebd985f20ac8f0f4ffa5b /priv/static/index.html | |
| parent | ab3089d6a718d4a70b0d702307d41e64e17bc505 (diff) | |
| parent | dfde2622d0c14195392e306fadc7c729c68da273 (diff) | |
| download | pleroma-dec23500d8988c22a99f049ef1d1e49328ba075a.tar.gz pleroma-dec23500d8988c22a99f049ef1d1e49328ba075a.zip | |
Resolve merge conflict
Diffstat (limited to 'priv/static/index.html')
| -rw-r--r-- | priv/static/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/priv/static/index.html b/priv/static/index.html index 167944753..78634236d 100644 --- a/priv/static/index.html +++ b/priv/static/index.html @@ -1 +1 @@ -<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><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><link href=/static/css/app.285fa56c62b811bbd37880f7e2656b13.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.60e190da7cc4cc4711dc.js></script><script type=text/javascript src=/static/js/vendor.48d4753220bd83360796.js></script><script type=text/javascript src=/static/js/app.6cb7378f44092df9536a.js></script></body></html>
\ No newline at end of file +<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><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><link href=/static/css/app.44bcebbab7b3203648fdb538eb16129b.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.18ee0a4963e1e9ec7ea6.js></script><script type=text/javascript src=/static/js/vendor.21f9327c919db89265c3.js></script><script type=text/javascript src=/static/js/app.f5ecd4e55f996aad6b8a.js></script></body></html>
\ No newline at end of file |