Merging with develop

Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex

1 files changed, 1 insertions, 1 deletions

diff --git a/priv/static/packs/flavours/glitch/async/favourites.js b/priv/static/packs/flavours/glitch/async/favourites.js
index 30d7bbbb6..9cdf445a2 100644
--- a/priv/static/packs/flavours/glitch/async/favourites.js
+++ b/priv/static/packs/flavours/glitch/async/favourites.js
@@ -1,2 +1,2 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[54],{672:function(t,a,s){"use strict";s.r(a),s.d(a,"default",function(){return y});var o,e,c,n=s(1),r=s(7),i=s(0),p=s(2),u=(s(3),s(20)),d=s(5),l=s.n(d),b=s(26),h=s.n(b),O=s(290),j=s(25),f=s(300),m=s(625),v=s(641),I=s(897),w=s(24),y=Object(u.connect)(function(t,a){return{accountIds:t.getIn(["user_lists","favourited_by",a.params.statusId])}})((c=e=function(e){function t(){for(var t,a=arguments.length,s=new Array(a),o=0;o<a;o++)s[o]=arguments[o];return t=e.call.apply(e,[this].concat(s))||this,Object(p.a)(Object(i.a)(Object(i.a)(t)),"shouldUpdateScroll",function(t,a){var s=a.location;return!(((t||{}).location||{}).state||{}).mastodonModalOpen&&!(s.state&&s.state.mastodonModalOpen)}),t}Object(r.a)(t,e);var a=t.prototype;return a.componentWillMount=function(){this.props.dispatch(Object(j.s)(this.props.params.statusId))},a.componentWillReceiveProps=function(t){t.params.statusId!==this.props.params.statusId&&t.params.statusId&&this.props.dispatch(Object(j.s)(t.params.statusId))},a.render=function(){var t=this.props.accountIds;return t?Object(n.a)(v.a,{},void 0,Object(n.a)(I.a,{}),Object(n.a)(f.a,{scrollKey:"favourites",shouldUpdateScroll:this.shouldUpdateScroll},void 0,Object(n.a)("div",{className:"scrollable"},void 0,t.map(function(t){return Object(n.a)(m.a,{id:t,withNote:!1},t)})))):Object(n.a)(v.a,{},void 0,Object(n.a)(O.a,{}))},t}(w.a),Object(p.a)(e,"propTypes",{params:l.a.object.isRequired,dispatch:l.a.func.isRequired,accountIds:h.a.list}),o=c))||o}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[54],{661:function(t,a,s){"use strict";s.r(a),s.d(a,"default",function(){return y});var o,e,n,c=s(0),r=s(3),i=s(7),p=s(1),u=(s(2),s(24)),d=s(5),l=s.n(d),b=s(27),h=s.n(b),O=s(271),f=s(49),j=s(426),m=s(600),v=s(624),I=s(929),w=s(25),y=Object(u.connect)(function(t,a){return{accountIds:t.getIn(["user_lists","favourited_by",a.params.statusId])}})((n=e=function(e){function t(){for(var t,a=arguments.length,s=new Array(a),o=0;o<a;o++)s[o]=arguments[o];return t=e.call.apply(e,[this].concat(s))||this,Object(p.a)(Object(r.a)(t),"shouldUpdateScroll",function(t,a){var s=a.location;return!(((t||{}).location||{}).state||{}).mastodonModalOpen&&!(s.state&&s.state.mastodonModalOpen)}),t}Object(i.a)(t,e);var a=t.prototype;return a.componentWillMount=function(){this.props.dispatch(Object(f.q)(this.props.params.statusId))},a.componentWillReceiveProps=function(t){t.params.statusId!==this.props.params.statusId&&t.params.statusId&&this.props.dispatch(Object(f.q)(t.params.statusId))},a.render=function(){var t=this.props.accountIds;return t?Object(c.a)(v.a,{},void 0,Object(c.a)(I.a,{}),Object(c.a)(j.a,{scrollKey:"favourites",shouldUpdateScroll:this.shouldUpdateScroll},void 0,Object(c.a)("div",{className:"scrollable"},void 0,t.map(function(t){return Object(c.a)(m.a,{id:t,withNote:!1},t)})))):Object(c.a)(v.a,{},void 0,Object(c.a)(O.a,{}))},t}(w.a),Object(p.a)(e,"propTypes",{params:l.a.object.isRequired,dispatch:l.a.func.isRequired,accountIds:h.a.list}),o=n))||o}}]);
 //# sourceMappingURL=favourites.js.map
\ No newline at end of file