Merge branch '2019-06-29-pleromafe' into 'develop'

Update frontend. See merge request pleroma/pleroma!1347
2019-06-28 12:39:51 +00:00 · 2019-06-28 12:39:51 +00:00 · f5b015b998
parent ad249f6f5f efad26bbb9
commit f5b015b998
9 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,user-scalable=no"><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/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.db80066bde2c96ea6198.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/vendors~app.ec33d2f791fb3c02da1d.js></script><script type=text/javascript src=/static/js/app.83ab168f1882edc9bb37.js></script></body></html>
+<!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 rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.db80066bde2c96ea6198.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/vendors~app.4b7be53256fba5c365c9.js></script><script type=text/javascript src=/static/js/app.670c36c0acc42fadb4fe.js></script></body></html>
--- a/priv/static/static/js/app.670c36c0acc42fadb4fe.js
+++ b/priv/static/static/js/app.670c36c0acc42fadb4fe.js
--- a/priv/static/static/js/app.670c36c0acc42fadb4fe.js.map
+++ b/priv/static/static/js/app.670c36c0acc42fadb4fe.js.map
--- a/priv/static/static/js/app.83ab168f1882edc9bb37.js
+++ b/priv/static/static/js/app.83ab168f1882edc9bb37.js
--- a/priv/static/static/js/app.83ab168f1882edc9bb37.js.map
+++ b/priv/static/static/js/app.83ab168f1882edc9bb37.js.map
--- a/priv/static/static/js/vendors~app.4b7be53256fba5c365c9.js
+++ b/priv/static/static/js/vendors~app.4b7be53256fba5c365c9.js
--- a/priv/static/static/js/vendors~app.4b7be53256fba5c365c9.js.map
+++ b/priv/static/static/js/vendors~app.4b7be53256fba5c365c9.js.map
--- a/priv/static/static/js/vendors~app.ec33d2f791fb3c02da1d.js.map
+++ b/priv/static/static/js/vendors~app.ec33d2f791fb3c02da1d.js.map
--- a/priv/static/sw-pleroma.js
+++ b/priv/static/sw-pleroma.js
		`@ -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 rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.db80066bde2c96ea6198.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/vendors~app.ec33d2f791fb3c02da1d.js></script><script type=text/javascript src=/static/js/app.83ab168f1882edc9bb37.js></script></body></html>				<!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 rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.db80066bde2c96ea6198.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/vendors~app.4b7be53256fba5c365c9.js></script><script type=text/javascript src=/static/js/app.670c36c0acc42fadb4fe.js></script></body></html>