projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e21afdb 92b4a1a)
Merge branch 'develop' into issue/1411
authorMark Felder <feld@FreeBSD.org>
Wed, 11 Dec 2019 21:02:53 +0000 (15:02 -0600)
committerMark Felder <feld@FreeBSD.org>
Wed, 11 Dec 2019 21:02:53 +0000 (15:02 -0600)
1  2 
lib/pleroma/object.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/activity_pub/activity_pub.ex patch | diff1 | diff2 | blob | history
test/web/activity_pub/activity_pub_test.exs patch | diff1 | diff2 | blob | history

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