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, 2 insertions, 0 deletions

diff --git a/priv/static/packs/flavours/glitch/async/pinned_statuses.js b/priv/static/packs/flavours/glitch/async/pinned_statuses.js
new file mode 100644
index 000000000..ee8f6cdf1
--- /dev/null
+++ b/priv/static/packs/flavours/glitch/async/pinned_statuses.js
@@ -0,0 +1,2 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[71],{665:function(t,e,n){"use strict";n.r(e),n.d(e,"default",function(){return y});var s,a,c,i=n(1),o=n(6),r=n(0),u=n(2),d=n(3),l=n.n(d),p=n(20),b=n(5),f=n.n(b),h=n(26),j=n.n(h),O=n(279),g=n(639),m=n(643),w=n(645),M=n(7),I=n(24),R=Object(M.f)({heading:{id:"column.pins",defaultMessage:"Pinned toot"}}),y=Object(p.connect)(function(t){return{statusIds:t.getIn(["status_lists","pins","items"]),hasMore:!!t.getIn(["status_lists","pins","next"])}})(s=Object(M.g)((c=a=function(a){function t(){for(var e,t=arguments.length,n=new Array(t),s=0;s<t;s++)n[s]=arguments[s];return e=a.call.apply(a,[this].concat(n))||this,Object(u.a)(Object(r.a)(Object(r.a)(e)),"handleHeaderClick",function(){e.column.scrollTop()}),Object(u.a)(Object(r.a)(Object(r.a)(e)),"setRef",function(t){e.column=t}),e}Object(o.a)(t,a);var e=t.prototype;return e.componentWillMount=function(){this.props.dispatch(Object(O.b)())},e.render=function(){var t=this.props,e=t.intl,n=t.statusIds,s=t.hasMore;return l.a.createElement(g.a,{icon:"thumb-tack",heading:e.formatMessage(R.heading),ref:this.setRef},Object(i.a)(m.a,{}),Object(i.a)(w.a,{statusIds:n,scrollKey:"pinned_statuses",hasMore:s}))},t}(I.a),Object(u.a)(a,"propTypes",{dispatch:f.a.func.isRequired,statusIds:j.a.list.isRequired,intl:f.a.object.isRequired,hasMore:f.a.bool.isRequired}),s=c))||s)||s}}]);
+//# sourceMappingURL=pinned_statuses.js.map
\ No newline at end of file