projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d7dc12 ef627b9)
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
authorfeld <feld@feld.me>
Thu, 29 Oct 2020 21:06:15 +0000 (21:06 +0000)
committerfeld <feld@feld.me>
Thu, 29 Oct 2020 21:06:15 +0000 (21:06 +0000)
[#2137] admin/users filters

See merge request pleroma/pleroma!3016

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