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

update pleroma frontend See merge request pleroma/pleroma!279
2018-08-20 18:17:05 +00:00 · 2018-08-20 18:17:05 +00:00 · 7266cc67ff
commit 7266cc67ff
parent f1c407e777 d8fb340565
10 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><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.0ab9d24e686c098d8119f6a6fed1d256.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.11b2f2bb8b3532b85cd3.js></script><script type=text/javascript src=/static/js/vendor.b6ebf54d0c5ab0f3ac53.js></script><script type=text/javascript src=/static/js/app.096480a795992ddf7203.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.c532695ce7a9bc84cc93f32ed3cb2864.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.ad63ba353e40eb894cd7.js></script><script type=text/javascript src=/static/js/vendor.b6ebf54d0c5ab0f3ac53.js></script><script type=text/javascript src=/static/js/app.468c1714cc7ceb24febd.js></script></body></html>
--- a/priv/static/static/css/app.0ab9d24e686c098d8119f6a6fed1d256.css
+++ b/priv/static/static/css/app.0ab9d24e686c098d8119f6a6fed1d256.css
--- a/priv/static/static/css/app.0ab9d24e686c098d8119f6a6fed1d256.css.map
+++ b/priv/static/static/css/app.0ab9d24e686c098d8119f6a6fed1d256.css.map
--- a/priv/static/static/css/app.c532695ce7a9bc84cc93f32ed3cb2864.css
+++ b/priv/static/static/css/app.c532695ce7a9bc84cc93f32ed3cb2864.css
--- a/priv/static/static/css/app.c532695ce7a9bc84cc93f32ed3cb2864.css.map
+++ b/priv/static/static/css/app.c532695ce7a9bc84cc93f32ed3cb2864.css.map
--- a/priv/static/static/js/app.468c1714cc7ceb24febd.js
+++ b/priv/static/static/js/app.468c1714cc7ceb24febd.js
--- a/priv/static/static/js/app.468c1714cc7ceb24febd.js.map
+++ b/priv/static/static/js/app.468c1714cc7ceb24febd.js.map
--- a/priv/static/static/js/manifest.11b2f2bb8b3532b85cd3.js
+++ b/priv/static/static/js/manifest.11b2f2bb8b3532b85cd3.js
--- a/priv/static/static/js/manifest.ad63ba353e40eb894cd7.js
+++ b/priv/static/static/js/manifest.ad63ba353e40eb894cd7.js
--- a/priv/static/static/js/manifest.ad63ba353e40eb894cd7.js.map
+++ b/priv/static/static/js/manifest.ad63ba353e40eb894cd7.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.0ab9d24e686c098d8119f6a6fed1d256.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.11b2f2bb8b3532b85cd3.js></script><script type=text/javascript src=/static/js/vendor.b6ebf54d0c5ab0f3ac53.js></script><script type=text/javascript src=/static/js/app.096480a795992ddf7203.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.c532695ce7a9bc84cc93f32ed3cb2864.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.ad63ba353e40eb894cd7.js></script><script type=text/javascript src=/static/js/vendor.b6ebf54d0c5ab0f3ac53.js></script><script type=text/javascript src=/static/js/app.468c1714cc7ceb24febd.js></script></body></html>