projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1fe46e 0a6c897)
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into...
authorlain <lain@soykaf.club>
Sat, 26 May 2018 13:15:52 +0000 (15:15 +0200)
committerlain <lain@soykaf.club>
Sat, 26 May 2018 13:15:52 +0000 (15:15 +0200)
1  2 
lib/pleroma/user.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/activity_pub/transmogrifier.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/activity_pub/utils.ex patch | diff1 | diff2 | blob | history

diff --cc lib/pleroma/user.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git