minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api' ...

# Conflicts:
#   lib/pleroma/web/router.ex

2020-11-02 10:43:45 +00:00

..

controllers

Merge branch 'develop' into 'frontend-admin-api'

2020-11-02 10:43:45 +00:00

views

…

search_test.exs

admin user search: added filter by actor_type

2020-10-22 11:53:28 +03:00