projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d04bd0 fb72f20)
Merge branch 'issue/2256' into 'develop'
authorfeld <feld@feld.me>
Fri, 4 Dec 2020 17:49:05 +0000 (17:49 +0000)
committerfeld <feld@feld.me>
Fri, 4 Dec 2020 17:49:05 +0000 (17:49 +0000)
[#2256] added subject actor to moderation log

See merge request pleroma/pleroma!3164

1  2 
lib/pleroma/activity.ex patch | diff1 | diff2 | blob | history
test/pleroma/activity_test.exs patch | diff1 | diff2 | blob | history

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