Merge branch 'develop' into frontend-switcher-9000
authorFloatingGhost <hannah@coffee-and-dreams.uk>
Fri, 14 Apr 2023 15:56:10 +0000 (16:56 +0100)
committerFloatingGhost <hannah@coffee-and-dreams.uk>
Fri, 14 Apr 2023 15:56:10 +0000 (16:56 +0100)
1  2 
config/config.exs
config/description.exs
lib/pleroma/web/router.ex

Simple merge
Simple merge
Simple merge