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

update-pleroma-frontend See merge request pleroma/pleroma!369
2018-10-07 01:09:33 +00:00 · 2018-10-07 01:09:33 +00:00 · a15eac05a6
commit a15eac05a6
parent 614e47aa7c be7bb90bef
12 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.fba176349cf0e390101c.js></script><script type=text/javascript src=/static/js/vendor.f9957f6e91d33ea4ed05.js></script><script type=text/javascript src=/static/js/app.3bdb8bed25e3fcc77b06.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.eee3fdcefdfdc13b7a9a.js></script><script type=text/javascript src=/static/js/vendor.1729433de915d5fd6a8e.js></script><script type=text/javascript src=/static/js/app.4687cd74d92cc8396de6.js></script></body></html>
--- a/priv/static/static/js/app.3bdb8bed25e3fcc77b06.js
+++ b/priv/static/static/js/app.3bdb8bed25e3fcc77b06.js
--- a/priv/static/static/js/app.3bdb8bed25e3fcc77b06.js.map
+++ b/priv/static/static/js/app.3bdb8bed25e3fcc77b06.js.map
--- a/priv/static/static/js/app.4687cd74d92cc8396de6.js
+++ b/priv/static/static/js/app.4687cd74d92cc8396de6.js
--- a/priv/static/static/js/app.4687cd74d92cc8396de6.js.map
+++ b/priv/static/static/js/app.4687cd74d92cc8396de6.js.map
--- a/priv/static/static/js/manifest.eee3fdcefdfdc13b7a9a.js
+++ b/priv/static/static/js/manifest.eee3fdcefdfdc13b7a9a.js
--- a/priv/static/static/js/manifest.eee3fdcefdfdc13b7a9a.js.map
+++ b/priv/static/static/js/manifest.eee3fdcefdfdc13b7a9a.js.map
--- a/priv/static/static/js/manifest.fba176349cf0e390101c.js
+++ b/priv/static/static/js/manifest.fba176349cf0e390101c.js
--- a/priv/static/static/js/vendor.1729433de915d5fd6a8e.js
+++ b/priv/static/static/js/vendor.1729433de915d5fd6a8e.js
--- a/priv/static/static/js/vendor.1729433de915d5fd6a8e.js.map
+++ b/priv/static/static/js/vendor.1729433de915d5fd6a8e.js.map
--- a/priv/static/static/js/vendor.f9957f6e91d33ea4ed05.js
+++ b/priv/static/static/js/vendor.f9957f6e91d33ea4ed05.js
--- a/priv/static/static/js/vendor.f9957f6e91d33ea4ed05.js.map
+++ b/priv/static/static/js/vendor.f9957f6e91d33ea4ed05.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.fba176349cf0e390101c.js></script><script type=text/javascript src=/static/js/vendor.f9957f6e91d33ea4ed05.js></script><script type=text/javascript src=/static/js/app.3bdb8bed25e3fcc77b06.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.eee3fdcefdfdc13b7a9a.js></script><script type=text/javascript src=/static/js/vendor.1729433de915d5fd6a8e.js></script><script type=text/javascript src=/static/js/app.4687cd74d92cc8396de6.js></script></body></html>