Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
authorAlex Gleason <alex@alexgleason.me>
Wed, 14 Jul 2021 03:47:47 +0000 (22:47 -0500)
committerAlex Gleason <alex@alexgleason.me>
Wed, 14 Jul 2021 03:47:47 +0000 (22:47 -0500)
commitdeb3f911366925bcc342a4a0deb44a2e7da7f1ba
treec8e587198f64c4c5f991a05561943c6bd0af465b
parent5e88796784e0ac2dbf57d9cf954fdc8ae8aeae43
parent173e977e283789a814278c63bc81f40a13942e21
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
lib/pleroma/web/admin_api/search.ex
test/pleroma/web/admin_api/controllers/user_controller_test.exs