Merge remote-tracking branch 'pleroma/develop' into manifest
authorAlex Gleason <alex@alexgleason.me>
Wed, 24 Nov 2021 23:58:58 +0000 (17:58 -0600)
committerAlex Gleason <alex@alexgleason.me>
Wed, 24 Nov 2021 23:58:58 +0000 (17:58 -0600)
commit720198d56950ca98f4d947dd630b0e170eda569b
treecd20e64e7daaa8ba033ba6510e137de2d2ccb24e
parentcb9359335f6b0e1d19fb82e4045740d30767254c
parentc97f99ccf2a51c7f1078d7a20006deae2df3d12c
Merge remote-tracking branch 'pleroma/develop' into manifest
lib/pleroma/web/router.ex
test/pleroma/web/plugs/frontend_static_plug_test.exs