diff options
| author | lain <lain@soykaf.club> | 2020-08-28 14:40:26 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-28 14:40:26 +0000 |
| commit | 51844b1e420fdfbceed6fda85e4c2e0ad87a9b1e (patch) | |
| tree | 21fbe0f8b6057a2641b474b3e62e94a7c42002a5 /priv/static/index.html | |
| parent | b41c8cff18f7c7e6a7170a479452b5dc3d659efa (diff) | |
| parent | ce387ce7306d944c11e63f0c86719afd5c2da2d2 (diff) | |
| download | pleroma-51844b1e420fdfbceed6fda85e4c2e0ad87a9b1e.tar.gz pleroma-51844b1e420fdfbceed6fda85e4c2e0ad87a9b1e.zip | |
Merge branch 'stable-sync/2.1.0' into 'develop'
Merge stable in develop and bump development version
Closes #1610, #1621, #1613, #1375, #1374, #1614, #1422, #1595, #1620, #1364, #1640, #1643, #1653, #1624, #764, #1687, #1698, #1670, #1677, #1727, #1559, #1746, #1313, #1810, #751, and #866
See merge request pleroma/pleroma!2928
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 7dd080b2d..c850e8756 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.1597327457363.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.811c8482146cad566f7e.js></script><script type=text/javascript src=/static/js/app.032cb80dafd1f208df1c.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/app.77b1644622e3bae24b6b.css rel=stylesheet><link href=/static/fontello.1598361006087.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.bc5812c087f5dbcb914d.js></script><script type=text/javascript src=/static/js/app.154c25316542278028a6.js></script></body></html>
\ No newline at end of file |