Merge remote-tracking branch 'pleroma/develop' into instance-deletion
authorAlex Gleason <alex@alexgleason.me>
Sat, 17 Jul 2021 20:03:43 +0000 (15:03 -0500)
committerAlex Gleason <alex@alexgleason.me>
Sat, 17 Jul 2021 20:03:43 +0000 (15:03 -0500)
commit3674179b26b3351e34f527b7e267a5ff0f551c2e
treeef705aed9e5ea92bfe5de04e1353d365b842e94e
parentbad79f79e65dc9b093f364393b802c67d632a5c6
parent3f58213646238aeca542e2f69ef3bbf0105eaa5d
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
lib/pleroma/web/router.ex