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

update pleroma frontend See merge request pleroma/pleroma!292
2018-08-24 22:00:13 +00:00 · 2018-08-24 22:00:13 +00:00 · 66bc37925e
parent ae0e41fd8b 47661ce44b
commit 66bc37925e
14 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.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>
+<!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.e07fc4f73aee0cb0cbffee2eba536027.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.91829bef2424fbfc7631.js></script><script type=text/javascript src=/static/js/vendor.d590300dfdab65a9b597.js></script><script type=text/javascript src=/static/js/app.0a721b31076fdf8dbe6f.js></script></body></html>
--- 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/css/app.e07fc4f73aee0cb0cbffee2eba536027.css
+++ b/priv/static/static/css/app.e07fc4f73aee0cb0cbffee2eba536027.css
--- a/priv/static/static/css/app.e07fc4f73aee0cb0cbffee2eba536027.css.map
+++ b/priv/static/static/css/app.e07fc4f73aee0cb0cbffee2eba536027.css.map
--- a/priv/static/static/js/app.0a721b31076fdf8dbe6f.js
+++ b/priv/static/static/js/app.0a721b31076fdf8dbe6f.js
--- a/priv/static/static/js/app.0a721b31076fdf8dbe6f.js.map
+++ b/priv/static/static/js/app.0a721b31076fdf8dbe6f.js.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.91829bef2424fbfc7631.js
+++ b/priv/static/static/js/manifest.91829bef2424fbfc7631.js
--- a/priv/static/static/js/manifest.91829bef2424fbfc7631.js.map
+++ b/priv/static/static/js/manifest.91829bef2424fbfc7631.js.map
--- a/priv/static/static/js/manifest.ad63ba353e40eb894cd7.js
+++ b/priv/static/static/js/manifest.ad63ba353e40eb894cd7.js
--- a/priv/static/static/js/vendor.d590300dfdab65a9b597.js
+++ b/priv/static/static/js/vendor.d590300dfdab65a9b597.js
--- a/priv/static/static/js/vendor.d590300dfdab65a9b597.js.map
+++ b/priv/static/static/js/vendor.d590300dfdab65a9b597.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.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>				<!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.e07fc4f73aee0cb0cbffee2eba536027.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.91829bef2424fbfc7631.js></script><script type=text/javascript src=/static/js/vendor.d590300dfdab65a9b597.js></script><script type=text/javascript src=/static/js/app.0a721b31076fdf8dbe6f.js></script></body></html>