projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9637cde 07e7c80)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Wed, 6 May 2020 09:44:30 +0000 (11:44 +0200)
committerlain <lain@soykaf.club>
Wed, 6 May 2020 09:44:30 +0000 (11:44 +0200)
1  2 
lib/pleroma/web/activity_pub/activity_pub.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/activity_pub/transmogrifier.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history

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