projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a38370 1199cf3)
Merge branch 'develop' into feature/admin-api-status-count-per-instance
authorRoman Chvanikov <chvanikoff@pm.me>
Mon, 18 May 2020 08:56:27 +0000 (11:56 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Mon, 18 May 2020 08:56:27 +0000 (11:56 +0300)
1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/web/admin_api/admin_api_controller.ex patch | diff1 | diff2 | blob | history
test/web/admin_api/admin_api_controller_test.exs patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git