projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10a11f0 1dd718e)
Merge branch 'develop' into fix/twittercards
authorMark Felder <feld@FreeBSD.org>
Tue, 19 Feb 2019 16:58:28 +0000 (16:58 +0000)
committerMark Felder <feld@FreeBSD.org>
Tue, 19 Feb 2019 16:58:28 +0000 (16:58 +0000)
1  2 
lib/pleroma/web/ostatus/ostatus_controller.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