Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 30 Aug 2021 21:04:42 +0000 (22:04 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 30 Aug 2021 21:04:42 +0000 (22:04 +0100)
commitb202cf15d6911e61045fccc4d793bddc4560ba68
tree58482b2fec31bec34fb26a9c1933f4679531e448
parentdaab1eaa6517cb2b31f890dbfb861f3d725a8efe
parent2e695dbe3b81860988e3cac2bf18cb63c57148d2
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs