Merge remote-tracking branch 'pleroma/develop' into staff-plug
authorAlex Gleason <alex@alexgleason.me>
Wed, 4 Aug 2021 16:48:57 +0000 (11:48 -0500)
committerAlex Gleason <alex@alexgleason.me>
Wed, 4 Aug 2021 16:48:57 +0000 (11:48 -0500)
1  2 
lib/pleroma/web/router.ex

Simple merge