projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 114930b 937d6c6)
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
authorMaxim Filippov <colixer@gmail.com>
Sun, 24 Nov 2019 16:43:11 +0000 (01:43 +0900)
committerMaxim Filippov <colixer@gmail.com>
Sun, 24 Nov 2019 16:43:11 +0000 (01:43 +0900)
1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history

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