pleroma/priv/static/adminfe/index.html
Sam Therapy 68bebfba57
Merge branch 'develop'
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-12-27 15:33:59 +01:00

7 lines
2.4 KiB
HTML

<<<<<<< HEAD
<!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.e9e69983.css rel=stylesheet><link href=chunk-libs.483faac0.css rel=stylesheet><link href=app.11e2c8ca.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.d84dfdc4.js></script><script type=text/javascript src=static/js/chunk-elementUI.81d6c4ce.js></script><script type=text/javascript src=static/js/chunk-libs.d0c20531.js></script><script type=text/javascript src=static/js/app.638b4e6f.js></script></body></html>
||||||| 8db82932a
<!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.f1f2be85.css rel=stylesheet><link href=chunk-libs.74976a6a.css rel=stylesheet><link href=app.143a1409.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.2a586239.js></script><script type=text/javascript src=static/js/chunk-elementUI.4c32a355.js></script><script type=text/javascript src=static/js/chunk-libs.55b24a78.js></script><script type=text/javascript src=static/js/app.f02f5ebc.js></script></body></html>
=======
<!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.852ab1db.css rel=stylesheet><link href=chunk-libs.0b4a26df.css rel=stylesheet><link href=app.147d87e8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.f1a41c33.js></script><script type=text/javascript src=static/js/chunk-elementUI.bec6fa77.js></script><script type=text/javascript src=static/js/chunk-libs.eb232bda.js></script><script type=text/javascript src=static/js/app.c3e187df.js></script></body></html>
>>>>>>> 2bc6911139a3aee68bc29d3c9838c7730d5ae706