Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
authormarcin mikołajczak <git@mkljczk.pl>
Tue, 28 Dec 2021 15:27:27 +0000 (16:27 +0100)
committermarcin mikołajczak <git@mkljczk.pl>
Tue, 28 Dec 2021 15:27:27 +0000 (16:27 +0100)
commit746c9daa62d591b0559768251889cccb025e7db0
tree6c95e23bf0c3c3a76dc25e013a7dfccd3d8a98be
parentf734579965b6f1a635e0622356e9cf6d4fff00bb
parentde7f84deb3ebe57744630950860f8fbf64a414a2
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
lib/pleroma/web/api_spec/operations/account_operation.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/router.ex
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs