[#468] Merged `upstream/develop`, resolved conflicts.

1 files changed, 1 insertions, 1 deletions

diff --git a/priv/static/packs/flavours/glitch/async/blocks.js b/priv/static/packs/flavours/glitch/async/blocks.js
index e36c866f2..a47ba64c6 100644
--- a/priv/static/packs/flavours/glitch/async/blocks.js
+++ b/priv/static/packs/flavours/glitch/async/blocks.js
@@ -1,2 +1,2 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[44],{674:function(t,e,a){"use strict";a.r(e),a.d(e,"default",function(){return y});var c,o,n,s=a(1),i=a(6),l=a(0),r=a(2),d=(a(3),a(20)),u=a(26),b=a.n(u),p=a(5),j=a.n(p),O=a(288),h=a(295),f=a(639),g=a(643),v=a(624),m=a(104),k=a(7),w=a(24),S=Object(k.f)({heading:{id:"column.blocks",defaultMessage:"Blocked users"}}),y=Object(d.connect)(function(t){return{accountIds:t.getIn(["user_lists","blocks","items"])}})(c=Object(k.g)((n=o=function(o){function t(){for(var a,t=arguments.length,e=new Array(t),c=0;c<t;c++)e[c]=arguments[c];return a=o.call.apply(o,[this].concat(e))||this,Object(r.a)(Object(l.a)(Object(l.a)(a)),"handleScroll",function(t){var e=t.target;e.scrollTop===e.scrollHeight-e.clientHeight&&a.props.dispatch(Object(m.c)())}),Object(r.a)(Object(l.a)(Object(l.a)(a)),"shouldUpdateScroll",function(t,e){var a=e.location;return!(((t||{}).location||{}).state||{}).mastodonModalOpen&&!(a.state&&a.state.mastodonModalOpen)}),a}Object(i.a)(t,o);var e=t.prototype;return e.componentWillMount=function(){this.props.dispatch(Object(m.d)())},e.render=function(){var t=this.props,e=t.intl,a=t.accountIds;return a?Object(s.a)(f.a,{name:"blocks",icon:"ban",heading:e.formatMessage(S.heading)},void 0,Object(s.a)(g.a,{}),Object(s.a)(h.a,{scrollKey:"blocks",shouldUpdateScroll:this.shouldUpdateScroll},void 0,Object(s.a)("div",{className:"scrollable",onScroll:this.handleScroll},void 0,a.map(function(t){return Object(s.a)(v.a,{id:t},t)})))):Object(s.a)(f.a,{},void 0,Object(s.a)(O.a,{}))},t}(w.a),Object(r.a)(o,"propTypes",{params:j.a.object.isRequired,dispatch:j.a.func.isRequired,accountIds:b.a.list,intl:j.a.object.isRequired}),c=n))||c)||c}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[44],{675:function(t,e,a){"use strict";a.r(e),a.d(e,"default",function(){return y});var c,o,n,s=a(1),i=a(6),l=a(0),r=a(2),d=(a(3),a(20)),u=a(26),b=a.n(u),p=a(5),j=a.n(p),O=a(290),h=a(297),f=a(640),g=a(644),v=a(625),m=a(105),k=a(7),w=a(24),S=Object(k.f)({heading:{id:"column.blocks",defaultMessage:"Blocked users"}}),y=Object(d.connect)(function(t){return{accountIds:t.getIn(["user_lists","blocks","items"])}})(c=Object(k.g)((n=o=function(o){function t(){for(var a,t=arguments.length,e=new Array(t),c=0;c<t;c++)e[c]=arguments[c];return a=o.call.apply(o,[this].concat(e))||this,Object(r.a)(Object(l.a)(Object(l.a)(a)),"handleScroll",function(t){var e=t.target;e.scrollTop===e.scrollHeight-e.clientHeight&&a.props.dispatch(Object(m.c)())}),Object(r.a)(Object(l.a)(Object(l.a)(a)),"shouldUpdateScroll",function(t,e){var a=e.location;return!(((t||{}).location||{}).state||{}).mastodonModalOpen&&!(a.state&&a.state.mastodonModalOpen)}),a}Object(i.a)(t,o);var e=t.prototype;return e.componentWillMount=function(){this.props.dispatch(Object(m.d)())},e.render=function(){var t=this.props,e=t.intl,a=t.accountIds;return a?Object(s.a)(f.a,{name:"blocks",icon:"ban",heading:e.formatMessage(S.heading)},void 0,Object(s.a)(g.a,{}),Object(s.a)(h.a,{scrollKey:"blocks",shouldUpdateScroll:this.shouldUpdateScroll},void 0,Object(s.a)("div",{className:"scrollable",onScroll:this.handleScroll},void 0,a.map(function(t){return Object(s.a)(v.a,{id:t},t)})))):Object(s.a)(f.a,{},void 0,Object(s.a)(O.a,{}))},t}(w.a),Object(r.a)(o,"propTypes",{params:j.a.object.isRequired,dispatch:j.a.func.isRequired,accountIds:b.a.list,intl:j.a.object.isRequired}),c=n))||c)||c}}]);
 //# sourceMappingURL=blocks.js.map
\ No newline at end of file