Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex

1 files changed, 0 insertions, 2 deletions

diff --git a/priv/static/packs/share.js b/priv/static/packs/share.js
deleted file mode 100644
index ab24102b3..000000000
--- a/priv/static/packs/share.js
+++ /dev/null
@@ -1,2 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[87],{386:function(t,e,n){"use strict";n.r(e);var r=n(0),o=n.n(r),a=n(6),c=n.n(a),i=n(3),s=n.n(i),u=n(7),p=n.n(u),d=n(1),l=n.n(d),f=n(12),v=n(101),b=n(29),h=n(4),m=n(8),O=n(203),g=n(144),j=n(143),w=n(99),y=function(t){function e(){return c()(this,e),s()(this,t.apply(this,arguments))}return p()(e,t),e.prototype.render=function(){return o()("div",{},void 0,o()(O.a,{}),o()(g.a,{}),o()(w.a,{}),o()(j.a,{className:"loading-bar"}))},e}(l.a.PureComponent),J=n(10);n.d(e,"default",function(){return N});var P=Object(m.getLocale)(),k=P.localeData,C=P.messages;Object(h.e)(k);var E=Object(v.a)();J.c&&E.dispatch(Object(b.b)(J.c));var N=function(t){function e(){return c()(this,e),s()(this,t.apply(this,arguments))}return p()(e,t),e.prototype.render=function(){var t=this.props.locale;return o()(h.d,{locale:t,messages:C},void 0,o()(f.Provider,{store:E},void 0,o()(y,{})))},e}(l.a.PureComponent)},446:function(t,e,n){"use strict";n.r(e);var r=n(67),o=n(66);function a(){var t=n(386).default,e=n(1),r=n(28),o=document.getElementById("mastodon-compose");if(null!==o){var a=JSON.parse(o.getAttribute("data-props"));r.render(e.createElement(t,a),o)}}Object(o.a)(),Object(r.a)().then(function(){(0,n(80).default)(a)}).catch(function(t){console.error(t)})}},[[446,0]]]);
-//# sourceMappingURL=share.js.map
\ No newline at end of file