Merge branch 'update-pleroma-frontend' into 'develop'

update pleroma frontend See merge request pleroma/pleroma!344
2018-09-16 01:09:38 +00:00 · 2018-09-16 01:09:38 +00:00 · 8eed5938d5
commit 8eed5938d5
parent c2650f0ffb f829b18273
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.a83a8ba1f1f30d64bc53.js></script><script type=text/javascript src=/static/js/vendor.117ce7369a023987d44a.js></script><script type=text/javascript src=/static/js/app.8b645dcc4822f7e06077.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.f73fcf466fd253b0e5c6.js></script><script type=text/javascript src=/static/js/vendor.04ec6dccb5e616b6deac.js></script><script type=text/javascript src=/static/js/app.daf013e442326e175355.js></script></body></html>
--- a/priv/static/static/js/app.8b645dcc4822f7e06077.js
+++ b/priv/static/static/js/app.8b645dcc4822f7e06077.js
--- a/priv/static/static/js/app.8b645dcc4822f7e06077.js.map
+++ b/priv/static/static/js/app.8b645dcc4822f7e06077.js.map
--- a/priv/static/static/js/app.daf013e442326e175355.js
+++ b/priv/static/static/js/app.daf013e442326e175355.js
--- a/priv/static/static/js/app.daf013e442326e175355.js.map
+++ b/priv/static/static/js/app.daf013e442326e175355.js.map
--- a/priv/static/static/js/manifest.f73fcf466fd253b0e5c6.js
+++ b/priv/static/static/js/manifest.f73fcf466fd253b0e5c6.js
--- a/priv/static/static/js/manifest.f73fcf466fd253b0e5c6.js.map
+++ b/priv/static/static/js/manifest.f73fcf466fd253b0e5c6.js.map
--- a/priv/static/static/js/vendor.04ec6dccb5e616b6deac.js
+++ b/priv/static/static/js/vendor.04ec6dccb5e616b6deac.js
--- a/priv/static/static/js/vendor.04ec6dccb5e616b6deac.js.map
+++ b/priv/static/static/js/vendor.04ec6dccb5e616b6deac.js.map
--- a/priv/static/static/js/vendor.117ce7369a023987d44a.js
+++ b/priv/static/static/js/vendor.117ce7369a023987d44a.js
--- a/priv/static/static/js/vendor.117ce7369a023987d44a.js.map
+++ b/priv/static/static/js/vendor.117ce7369a023987d44a.js.map
		`@ -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.a83a8ba1f1f30d64bc53.js></script><script type=text/javascript src=/static/js/vendor.117ce7369a023987d44a.js></script><script type=text/javascript src=/static/js/app.8b645dcc4822f7e06077.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.f73fcf466fd253b0e5c6.js></script><script type=text/javascript src=/static/js/vendor.04ec6dccb5e616b6deac.js></script><script type=text/javascript src=/static/js/app.daf013e442326e175355.js></script></body></html>