Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6e...
authorAlex Gleason <alex@alexgleason.me>
Sun, 30 May 2021 17:58:24 +0000 (12:58 -0500)
committerAlex Gleason <alex@alexgleason.me>
Sun, 30 May 2021 17:58:24 +0000 (12:58 -0500)
1  2  3  4  5  6  7  8  9  10 
lib/pleroma/web.ex
lib/pleroma/web/router.ex

Simple merge
Simple merge