Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation...
authorlain <lain@soykaf.club>
Wed, 4 Nov 2020 14:38:10 +0000 (15:38 +0100)
committerlain <lain@soykaf.club>
Wed, 4 Nov 2020 14:38:10 +0000 (15:38 +0100)
commit504a829edb821f24fe7138380e77533cc9f802e6
treed63c3a26e31ec608274becc2e53d0894151b4fe8
parent2ca98f2d94e2976ae35998aecff27809d4b066cf
parentbc4d9c4ffc9ccd826220893a97ce695e4bb66f9d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
lib/pleroma/web/router.ex