projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a0cb34 173e977)
Merge remote-tracking branch 'pleroma/develop' into fix-object-deletion-timeout
authorAlex Gleason <alex@alexgleason.me>
Mon, 12 Jul 2021 21:23:06 +0000 (16:23 -0500)
committerAlex Gleason <alex@alexgleason.me>
Mon, 12 Jul 2021 21:23:06 +0000 (16:23 -0500)
1  2 
lib/pleroma/activity.ex patch | diff1 | diff2 | blob | history

diff --cc lib/pleroma/activity.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git