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)
commitff3b09f6b307fc9f0d10b941f204824f496df2ae
treee5f7948fee3d5e7f4c34b0aa2a919ef3b2a3d969
parentc6ab5ebe7cd31ef7aa040d280d5efa63f9bcdc50
parent10a7a4a868fbc5ff09516892b99e11100d5d3660
Merge branch 'fix/ap-icon' into 'develop'

Do not federate instance avatar

Closes #759

See merge request pleroma/pleroma!977
lib/pleroma/user.ex