Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
authorAlex Gleason <alex@alexgleason.me>
Wed, 14 Jul 2021 14:02:55 +0000 (09:02 -0500)
committerAlex Gleason <alex@alexgleason.me>
Wed, 14 Jul 2021 14:02:55 +0000 (09:02 -0500)
commit1a2fe96d56350dc685eb53112630af567de8d5bd
tree31f5c24d81ab1a226776158d4bb1a62ef72c8834
parent167e14416bec2846d3282a121cfcfd147a04a8bf
parent173e977e283789a814278c63bc81f40a13942e21
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
lib/pleroma/web/admin_api/views/account_view.ex
test/pleroma/web/admin_api/controllers/user_controller_test.exs