Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 21 Jan 2019 13:03:32 +0000 (13:03 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 21 Jan 2019 13:03:32 +0000 (13:03 +0000)
commit8cd853ce0c2d67614dc2e0b07b4cf855a2a381d2
tree4442ec2d7b07ebae6c5601d6822959960e47a95d
parent69454c834519a68b80318ad0efecd682a1013cda
parenta4d3fec8a71241d5c40fa76e33f15fa217154600
Merge branch '530_federator_user_info_overwrite_fix' into 'develop'

[#530] Prevents user `info` from being overwritten because of race conditions

Closes #530

See merge request pleroma/pleroma!691
lib/pleroma/web/activity_pub/activity_pub.ex