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

update pleroma frontend See merge request pleroma/pleroma!276
2018-08-18 18:24:33 +00:00 · 2018-08-18 18:24:33 +00:00 · b46156be92
parent 4ad7531dc0 d8bb27970b
commit b46156be92
16 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.4e316dc76ab907cb78bb88b978ce04e2.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.212bbb8f66cdc9a7eebf.js></script><script type=text/javascript src=/static/js/vendor.da712c56a19114013b34.js></script><script type=text/javascript src=/static/js/app.9d52d5cd0ef719b7db59.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.e5c6f3038c39d19c219c8fec34956df9.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.497e4bcf5f2251fee98a.js></script><script type=text/javascript src=/static/js/vendor.7f1c3048de529fb91f88.js></script><script type=text/javascript src=/static/js/app.531c537a07309a37efa0.js></script></body></html>
--- a/priv/static/static/css/app.4e316dc76ab907cb78bb88b978ce04e2.css
+++ b/priv/static/static/css/app.4e316dc76ab907cb78bb88b978ce04e2.css
--- a/priv/static/static/css/app.4e316dc76ab907cb78bb88b978ce04e2.css.map
+++ b/priv/static/static/css/app.4e316dc76ab907cb78bb88b978ce04e2.css.map
--- a/priv/static/static/css/app.e5c6f3038c39d19c219c8fec34956df9.css
+++ b/priv/static/static/css/app.e5c6f3038c39d19c219c8fec34956df9.css
--- a/priv/static/static/css/app.e5c6f3038c39d19c219c8fec34956df9.css.map
+++ b/priv/static/static/css/app.e5c6f3038c39d19c219c8fec34956df9.css.map
--- a/priv/static/static/js/app.531c537a07309a37efa0.js
+++ b/priv/static/static/js/app.531c537a07309a37efa0.js
--- a/priv/static/static/js/app.531c537a07309a37efa0.js.map
+++ b/priv/static/static/js/app.531c537a07309a37efa0.js.map
--- a/priv/static/static/js/app.9d52d5cd0ef719b7db59.js
+++ b/priv/static/static/js/app.9d52d5cd0ef719b7db59.js
--- a/priv/static/static/js/app.9d52d5cd0ef719b7db59.js.map
+++ b/priv/static/static/js/app.9d52d5cd0ef719b7db59.js.map
--- a/priv/static/static/js/manifest.212bbb8f66cdc9a7eebf.js
+++ b/priv/static/static/js/manifest.212bbb8f66cdc9a7eebf.js
--- a/priv/static/static/js/manifest.497e4bcf5f2251fee98a.js
+++ b/priv/static/static/js/manifest.497e4bcf5f2251fee98a.js
--- a/priv/static/static/js/manifest.497e4bcf5f2251fee98a.js.map
+++ b/priv/static/static/js/manifest.497e4bcf5f2251fee98a.js.map
--- a/priv/static/static/js/vendor.7f1c3048de529fb91f88.js
+++ b/priv/static/static/js/vendor.7f1c3048de529fb91f88.js
--- a/priv/static/static/js/vendor.7f1c3048de529fb91f88.js.map
+++ b/priv/static/static/js/vendor.7f1c3048de529fb91f88.js.map
--- a/priv/static/static/js/vendor.da712c56a19114013b34.js
+++ b/priv/static/static/js/vendor.da712c56a19114013b34.js
--- a/priv/static/static/js/vendor.da712c56a19114013b34.js.map
+++ b/priv/static/static/js/vendor.da712c56a19114013b34.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.4e316dc76ab907cb78bb88b978ce04e2.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.212bbb8f66cdc9a7eebf.js></script><script type=text/javascript src=/static/js/vendor.da712c56a19114013b34.js></script><script type=text/javascript src=/static/js/app.9d52d5cd0ef719b7db59.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.e5c6f3038c39d19c219c8fec34956df9.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.497e4bcf5f2251fee98a.js></script><script type=text/javascript src=/static/js/vendor.7f1c3048de529fb91f88.js></script><script type=text/javascript src=/static/js/app.531c537a07309a37efa0.js></script></body></html>