Merge remote-tracking branch 'origin/develop' into notice-routes
authorAlex Gleason <alex@alexgleason.me>
Sun, 26 Dec 2021 01:57:53 +0000 (19:57 -0600)
committerAlex Gleason <alex@alexgleason.me>
Sun, 26 Dec 2021 01:57:53 +0000 (19:57 -0600)
commitdb2bf55e9bb31af2ed34805ca7fa98ce67b471b1
treef532711eaf19111e22375e87706edf5a3024e5b5
parentb15c4629ff3093353ac5e37d381db1cdc4da1c3a
parent73609211a425922a5068d3912a36b82abe24e12c
Merge remote-tracking branch 'origin/develop' into notice-routes
CHANGELOG.md
lib/pleroma/web/router.ex
lib/pleroma/web/static_fe/static_fe_controller.ex
test/pleroma/web/o_status/o_status_controller_test.exs
test/pleroma/web/plugs/frontend_static_plug_test.exs