Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 23 Mar 2021 23:01:07 +0000 (23:01 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 23 Mar 2021 23:01:07 +0000 (23:01 +0000)
commit5f62b55a6f71669d7aba358bd57f8319b724c9c8
tree34a55ec85cff30382f601aea960af85ffb5818dd
parent292ddf730c933547d112704d459a3318ea4899c3
parentcaadde3b04cf4c6509cc0841a338503e646221a0
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs