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)
commit4c9c959bb3c3968e996975289def82f392d102ae
tree9f415d9832af1db5b95b95125977ee866b7c4cd4
parent9e8e7cc13ebd2ec2ecbf90ae10c3532f77af7a81
parent62e22eeff23b8841e3cdc7e4a4ee6ef29b612aca
Merge branch 'develop' into frontend-switcher-9000
config/config.exs
config/description.exs
lib/pleroma/web/router.ex