Merge remote-tracking branch 'pleroma/develop' into moderators
authorAlex Gleason <alex@alexgleason.me>
Thu, 5 Aug 2021 14:43:24 +0000 (09:43 -0500)
committerAlex Gleason <alex@alexgleason.me>
Thu, 5 Aug 2021 16:11:24 +0000 (11:11 -0500)
1  2 
lib/pleroma/web/router.ex

Simple merge