diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-11-14 19:48:47 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-11-14 19:48:47 -0600 |
| commit | 9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af (patch) | |
| tree | cc6b9add45f34878b1ce053b6a408e059768fa6a /priv/static | |
| parent | dc38dc847207e4724265fbeb111d0a236b75f93f (diff) | |
| parent | 28da36975dc325bb577ee81fb791fbdc7ec3e7e2 (diff) | |
| download | pleroma-9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af.tar.gz pleroma-9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af.zip | |
Merge remote-tracking branch 'upstream/develop' into registration-workflow
Diffstat (limited to 'priv/static')
| -rw-r--r-- | priv/static/favicon.png | bin | 1603 -> 1583 bytes | |||
| -rw-r--r-- | priv/static/index.html | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/priv/static/favicon.png b/priv/static/favicon.png Binary files differindex a96d5d252..098040a00 100644 --- a/priv/static/favicon.png +++ b/priv/static/favicon.png diff --git a/priv/static/index.html b/priv/static/index.html index f5690a8d6..e848c5f8c 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/app.77b1644622e3bae24b6b.css rel=stylesheet><link href=/static/fontello.1600365488745.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.90c4af83c1ae68f4cd95.js></script><script type=text/javascript src=/static/js/app.826c44232e0a76bbd9ba.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.77b1644622e3bae24b6b.css rel=stylesheet><link href=/static/fontello.1600365488745.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.90c4af83c1ae68f4cd95.js></script><script type=text/javascript src=/static/js/app.826c44232e0a76bbd9ba.js></script></body></html> |
