diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-02-03 09:31:38 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-02-03 09:31:38 +0300 |
| commit | 4e14945670bac15a6e183eb8c552d6e0669713ac (patch) | |
| tree | c25db5253cafb81dbfa31cc779ffae8e07806b7e /priv/static/index.html | |
| parent | cf4765af4098098fa4d6996193432bd19c439a75 (diff) | |
| parent | fd2477dfba1f167c7519a029bedd7ae6884a9f1d (diff) | |
| download | pleroma-4e14945670bac15a6e183eb8c552d6e0669713ac.tar.gz pleroma-4e14945670bac15a6e183eb8c552d6e0669713ac.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.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 c4dcf5d37..79d67c4c2 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"><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/app.9a4c5ede37b2f0230836.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.54838a79dee084ec3dad.js></script><script type=text/javascript src=/static/js/app.eb8f7164fc75862a251d.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"><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/app.9a4c5ede37b2f0230836.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.3b02e2e5bd8cdca42216.js></script><script type=text/javascript src=/static/js/app.c6b8a1c86149ed63e6ff.js></script></body></html>
\ No newline at end of file |