projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66b5d0f 2ebe8c4)
Merge branch 'develop' into feature/masto_api_markers
authorMaksim Pechnikov <parallel588@gmail.com>
Mon, 21 Oct 2019 08:32:28 +0000 (11:32 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Mon, 21 Oct 2019 08:32:28 +0000 (11:32 +0300)
1  2 
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history
test/support/factory.ex patch | diff1 | diff2 | blob | history

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