Merge remote-tracking branch 'origin/develop' into manifest
authorAlex Gleason <alex@alexgleason.me>
Sun, 19 Dec 2021 17:33:10 +0000 (11:33 -0600)
committerAlex Gleason <alex@alexgleason.me>
Sun, 19 Dec 2021 17:33:10 +0000 (11:33 -0600)
commite4f9cb1c1b3969164c03a219d5a760df07d2b3cd
treed9549feae7691be9988106f2a92ea387b3fdeaf2
parent720198d56950ca98f4d947dd630b0e170eda569b
parentbd853199d93e03fedf43397455939c6d633fa36b
Merge remote-tracking branch 'origin/develop' into manifest
lib/pleroma/web/router.ex
test/pleroma/web/plugs/frontend_static_plug_test.exs