Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
authorAlex Gleason <alex@alexgleason.me>
Tue, 28 Dec 2021 00:01:25 +0000 (18:01 -0600)
committerAlex Gleason <alex@alexgleason.me>
Tue, 28 Dec 2021 00:01:25 +0000 (18:01 -0600)
commitf5c3d45120364681b3601baa36a0ce9fa22680d7
tree5f1379ca293a001111585849521615d69880b7cb
parent3117c6099733207b7f2a777f8cb8b5b3b839ebe8
parent264f0fde1b9f0cbaf7679eeb59938eb9ca653779
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
lib/pleroma/web/mastodon_api/controllers/app_controller.ex
lib/pleroma/web/router.ex