Merge branch 'fix/ap-icon' into 'develop'
authorlambda <lain@soykaf.club>
Tue, 26 Mar 2019 16:12:50 +0000 (16:12 +0000)
committerlambda <lain@soykaf.club>
Tue, 26 Mar 2019 16:12:50 +0000 (16:12 +0000)
Do not federate instance avatar

Closes #759

See merge request pleroma/pleroma!977

1  2 
lib/pleroma/user.ex

Simple merge