diff options
| author | lain <lain@soykaf.club> | 2020-05-16 17:07:09 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-16 17:07:09 +0000 |
| commit | d15aa9d9503e59b3cd0731394855781f435ec63c (patch) | |
| tree | 844810415def046a2fc886d0bc1baeb1ff9afb21 /priv/static/index.html | |
| parent | 9cf4c4fa73e68f03791c5cc70505b710be39b677 (diff) | |
| parent | 3bc1138dd9beec03d2336fa1ad45dd23816f5285 (diff) | |
| download | pleroma-d15aa9d9503e59b3cd0731394855781f435ec63c.tar.gz pleroma-d15aa9d9503e59b3cd0731394855781f435ec63c.zip | |
Merge branch 'develop' into 'remove-twitter-api'
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
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 4304bdcbb..b37cbaa67 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,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.1055039ce3f2fe4dd110.css rel=stylesheet><link href=/static/fontello.1583594169021.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.c5bbd3734647f0cc7eef.js></script><script type=text/javascript src=/static/js/app.5c94bdec79a7d0f3cfcb.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,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/vendors~app.18fea621d430000acc27.css rel=stylesheet><link href=/static/css/app.613cef07981cd95ccceb.css rel=stylesheet><link href=/static/fontello.1588947937982.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.561a1c605d1dfb0e6f74.js></script><script type=text/javascript src=/static/js/app.996428ccaaaa7f28cb8d.js></script></body></html>
\ No newline at end of file |