Merge branch '2019-1-20-update-frontend' into 'develop'

update frontend See merge request pleroma/pleroma!686
2019-01-20 10:42:06 +00:00 · 2019-01-20 10:42:06 +00:00 · 2020f26040
parent f3045a179e deeda94513
commit 2020f26040
18 changed files with 2 additions and 2 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><!--server-generated-meta--><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.c52cbb57296d5c682ff405d562e83a9b.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.e833e1c75fbc9f2b69b4.js></script><script type=text/javascript src=/static/js/vendor.b6e63c523d95d763c254.js></script><script type=text/javascript src=/static/js/app.1c83eacd8eddeef56c69.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><!--server-generated-meta--><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.3d3e30a9afb8c41739656f496e8c79e6.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.e58590e04ca06ebbea1e.js></script><script type=text/javascript src=/static/js/vendor.61fac267296f19262d14.js></script><script type=text/javascript src=/static/js/app.76e23c93f1de5902c4d7.js></script></body></html>
--- a/priv/static/static/css/app.3d3e30a9afb8c41739656f496e8c79e6.css
+++ b/priv/static/static/css/app.3d3e30a9afb8c41739656f496e8c79e6.css
--- a/priv/static/static/css/app.3d3e30a9afb8c41739656f496e8c79e6.css.map
+++ b/priv/static/static/css/app.3d3e30a9afb8c41739656f496e8c79e6.css.map
--- a/priv/static/static/css/app.c52cbb57296d5c682ff405d562e83a9b.css
+++ b/priv/static/static/css/app.c52cbb57296d5c682ff405d562e83a9b.css
--- a/priv/static/static/css/app.c52cbb57296d5c682ff405d562e83a9b.css.map
+++ b/priv/static/static/css/app.c52cbb57296d5c682ff405d562e83a9b.css.map
--- a/priv/static/static/js/app.1c83eacd8eddeef56c69.js
+++ b/priv/static/static/js/app.1c83eacd8eddeef56c69.js
--- a/priv/static/static/js/app.1c83eacd8eddeef56c69.js.map
+++ b/priv/static/static/js/app.1c83eacd8eddeef56c69.js.map
--- a/priv/static/static/js/app.76e23c93f1de5902c4d7.js
+++ b/priv/static/static/js/app.76e23c93f1de5902c4d7.js
--- a/priv/static/static/js/app.76e23c93f1de5902c4d7.js.map
+++ b/priv/static/static/js/app.76e23c93f1de5902c4d7.js.map
--- a/priv/static/static/js/manifest.e58590e04ca06ebbea1e.js
+++ b/priv/static/static/js/manifest.e58590e04ca06ebbea1e.js
--- a/priv/static/static/js/manifest.e58590e04ca06ebbea1e.js.map
+++ b/priv/static/static/js/manifest.e58590e04ca06ebbea1e.js.map
--- a/priv/static/static/js/vendor.61fac267296f19262d14.js
+++ b/priv/static/static/js/vendor.61fac267296f19262d14.js
--- a/priv/static/static/js/vendor.61fac267296f19262d14.js.map
+++ b/priv/static/static/js/vendor.61fac267296f19262d14.js.map
--- a/priv/static/static/js/vendor.b6e63c523d95d763c254.js
+++ b/priv/static/static/js/vendor.b6e63c523d95d763c254.js
--- a/priv/static/static/js/vendor.b6e63c523d95d763c254.js.map
+++ b/priv/static/static/js/vendor.b6e63c523d95d763c254.js.map
--- a/priv/static/static/logo.png
+++ b/priv/static/static/logo.png
--- a/priv/static/sw.js
+++ b/priv/static/sw.js
--- a/priv/static/sw.js.map
+++ b/priv/static/sw.js.map