Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'

PleromaFE bundle supporting `with_relationships` param See merge request pleroma/pleroma!2530
2020-05-17 07:26:56 +00:00 · 2020-05-17 07:26:56 +00:00 · 21c85a106c
commit 21c85a106c
parent 4b28d812cf 74912dd9ee
13 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,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/vendors~app.18fea621d430000acc27.css rel=stylesheet><link href=/static/css/app.613cef07981cd95ccceb.css rel=stylesheet><link href=/static/fontello.1588947937982.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.561a1c605d1dfb0e6f74.js></script><script type=text/javascript src=/static/js/app.996428ccaaaa7f28cb8d.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/vendors~app.18fea621d430000acc27.css rel=stylesheet><link href=/static/css/app.613cef07981cd95ccceb.css rel=stylesheet><link href=/static/fontello.1589385935077.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.561a1c605d1dfb0e6f74.js></script><script type=text/javascript src=/static/js/app.838ffa9aecf210c7d744.js></script></body></html>
--- a/priv/static/static/font/fontello.1588947937982.woff2
+++ b/priv/static/static/font/fontello.1588947937982.woff2
--- a/priv/static/static/font/fontello.1589385935077.eot
+++ b/priv/static/static/font/fontello.1589385935077.eot
--- a/priv/static/static/font/fontello.1589385935077.svg
+++ b/priv/static/static/font/fontello.1589385935077.svg
--- a/priv/static/static/font/fontello.1589385935077.ttf
+++ b/priv/static/static/font/fontello.1589385935077.ttf
--- a/priv/static/static/font/fontello.1589385935077.woff
+++ b/priv/static/static/font/fontello.1589385935077.woff
--- a/priv/static/static/font/fontello.1589385935077.woff2
+++ b/priv/static/static/font/fontello.1589385935077.woff2
--- a/priv/static/static/fontello.1589385935077.css
+++ b/priv/static/static/fontello.1589385935077.css
--- a/priv/static/static/js/app.838ffa9aecf210c7d744.js
+++ b/priv/static/static/js/app.838ffa9aecf210c7d744.js
--- a/priv/static/static/js/app.838ffa9aecf210c7d744.js.map
+++ b/priv/static/static/js/app.838ffa9aecf210c7d744.js.map
--- a/priv/static/static/js/app.996428ccaaaa7f28cb8d.js
+++ b/priv/static/static/js/app.996428ccaaaa7f28cb8d.js
--- a/priv/static/static/js/app.996428ccaaaa7f28cb8d.js.map
+++ b/priv/static/static/js/app.996428ccaaaa7f28cb8d.js.map
--- a/priv/static/sw-pleroma.js
+++ b/priv/static/sw-pleroma.js
		`@ -1 +1 @@`
			<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/vendors~app.18fea621d430000acc27.css rel=stylesheet><link href=/static/css/app.613cef07981cd95ccceb.css rel=stylesheet><link href=/static/fontello.1588947937982.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.561a1c605d1dfb0e6f74.js></script><script type=text/javascript src=/static/js/app.996428ccaaaa7f28cb8d.js></script></body></html>				<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/vendors~app.18fea621d430000acc27.css rel=stylesheet><link href=/static/css/app.613cef07981cd95ccceb.css rel=stylesheet><link href=/static/fontello.1589385935077.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.561a1c605d1dfb0e6f74.js></script><script type=text/javascript src=/static/js/app.838ffa9aecf210c7d744.js></script></body></html>