projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 094edde 4d852f3)
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 5 Oct 2020 20:50:08 +0000 (23:50 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 5 Oct 2020 20:50:08 +0000 (23:50 +0300)
1  2 
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