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)
1  2 
lib/pleroma/web/router.ex

Simple merge