projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
69454c8
a4d3fec
)
Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Mon, 21 Jan 2019 13:03:32 +0000
(13:03 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Mon, 21 Jan 2019 13:03:32 +0000
(13:03 +0000)
[#530] Prevents user `info` from being overwritten because of race conditions
Closes #530
See merge request pleroma/pleroma!691
1
2
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
projects / akkoma / commitdiff