Merge remote-tracking branch 'origin/develop' into live-dashboard
authorAlex Gleason <alex@alexgleason.me>
Thu, 16 Dec 2021 00:05:36 +0000 (19:05 -0500)
committerAlex Gleason <alex@alexgleason.me>
Thu, 16 Dec 2021 00:05:36 +0000 (19:05 -0500)
commite1b89fe3aa2c03576a6f2418c1e83c0ed64707a3
tree6a8b31ef3612c4f8f5b405361c7cb875f4661d84
parent29d80b39f287ed2488a612280d41e9dd2e40a7cc
parent6eb7d69e60a96e577de92de232ed48e509f23cd4
Merge remote-tracking branch 'origin/develop' into live-dashboard
config/config.exs
lib/pleroma/web/router.ex
mix.exs
mix.lock
test/pleroma/web/plugs/frontend_static_plug_test.exs