projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39b766c 7616012)
Merge branch 'chore/merge-search-into-list-users' into 'develop'
authorkaniini <nenolod@gmail.com>
Wed, 6 Mar 2019 22:27:42 +0000 (22:27 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 6 Mar 2019 22:27:42 +0000 (22:27 +0000)
Merge search endpoint into /users

See merge request pleroma/pleroma!898

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