diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-08 13:42:15 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-08 13:42:15 +0000 |
| commit | 663e46606711720bac7bce5e1c89fb0f11e77e50 (patch) | |
| tree | 2e1a0068583ca62870a15590c4ccba237999f51a /priv/static/adminfe/index.html | |
| parent | 6d797b99282ff1067c6af04b3e1775ff2281333b (diff) | |
| parent | e8493431bfc16977e43715bf8bdb09ac46580028 (diff) | |
| download | pleroma-663e46606711720bac7bce5e1c89fb0f11e77e50.tar.gz pleroma-663e46606711720bac7bce5e1c89fb0f11e77e50.zip | |
Merge branch 'stable' into 'develop'
Sync develop with stable
Closes #1262, #1267, #1293, #1303, #1287, #1291, #1382, #1438, #1129, #1109, and #1606
See merge request pleroma/pleroma!2278
Diffstat (limited to 'priv/static/adminfe/index.html')
| -rw-r--r-- | priv/static/adminfe/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/priv/static/adminfe/index.html b/priv/static/adminfe/index.html index b0bdb162d..e2db408c3 100644 --- a/priv/static/adminfe/index.html +++ b/priv/static/adminfe/index.html @@ -1 +1 @@ -<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.1abbc9b8.css rel=stylesheet><link href=chunk-libs.686b5876.css rel=stylesheet><link href=app.c836e084.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.ae93ea9f.js></script><script type=text/javascript src=static/js/chunk-elementUI.fba0efec.js></script><script type=text/javascript src=static/js/chunk-libs.b8c453ab.js></script><script type=text/javascript src=static/js/app.30262183.js></script></body></html>
\ No newline at end of file +<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.1abbc9b8.css rel=stylesheet><link href=chunk-libs.686b5876.css rel=stylesheet><link href=app.c836e084.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.ae93ea9f.js></script><script type=text/javascript src=static/js/chunk-elementUI.fba0efec.js></script><script type=text/javascript src=static/js/chunk-libs.b8c453ab.js></script><script type=text/javascript src=static/js/app.55df3157.js></script></body></html>
\ No newline at end of file |