Merge branch 'update/pleroma-fe-20181118' into 'develop'

update pleroma frontend See merge request pleroma/pleroma!464
2018-11-18 17:29:25 +00:00 · 2018-11-18 17:29:25 +00:00 · fbc3f2893a
parent 5143501426 db8f269cd3
commit fbc3f2893a
11 changed files with 1 additions and 1 deletions
--- 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"><title>Pleroma</title><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.0808aeafc6252b3050ea95b17dcaff1a.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.35cf9744b80c38efa9fa.js></script><script type=text/javascript src=/static/js/vendor.7e4a5b87ce584522089d.js></script><script type=text/javascript src=/static/js/app.a65abd01bcd13a691048.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.0808aeafc6252b3050ea95b17dcaff1a.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.34667c2817916147413f.js></script><script type=text/javascript src=/static/js/vendor.32c621c7157f34c20923.js></script><script type=text/javascript src=/static/js/app.065638d22ade92dea420.js></script></body></html>
--- a/priv/static/static/js/app.065638d22ade92dea420.js
+++ b/priv/static/static/js/app.065638d22ade92dea420.js
--- a/priv/static/static/js/app.065638d22ade92dea420.js.map
+++ b/priv/static/static/js/app.065638d22ade92dea420.js.map
--- a/priv/static/static/js/app.a65abd01bcd13a691048.js
+++ b/priv/static/static/js/app.a65abd01bcd13a691048.js
--- a/priv/static/static/js/app.a65abd01bcd13a691048.js.map
+++ b/priv/static/static/js/app.a65abd01bcd13a691048.js.map
--- a/priv/static/static/js/manifest.34667c2817916147413f.js
+++ b/priv/static/static/js/manifest.34667c2817916147413f.js
--- a/priv/static/static/js/manifest.34667c2817916147413f.js.map
+++ b/priv/static/static/js/manifest.34667c2817916147413f.js.map
--- a/priv/static/static/js/manifest.35cf9744b80c38efa9fa.js
+++ b/priv/static/static/js/manifest.35cf9744b80c38efa9fa.js
--- a/priv/static/static/js/vendor.32c621c7157f34c20923.js
+++ b/priv/static/static/js/vendor.32c621c7157f34c20923.js
--- a/priv/static/static/js/vendor.32c621c7157f34c20923.js.map
+++ b/priv/static/static/js/vendor.32c621c7157f34c20923.js.map
--- a/priv/static/static/js/vendor.7e4a5b87ce584522089d.js.map
+++ b/priv/static/static/js/vendor.7e4a5b87ce584522089d.js.map