Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 15 Sep 2020 16:21:18 +0000 (17:21 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 15 Sep 2020 16:21:18 +0000 (17:21 +0100)
commit95a1e5bf5a9cc0d46b5fc209cd7e688b297ae905
tree4a3fcda7300c786f998e2efdf13a8259d9176085
parent9f9722d9923a924e525019dd3505b14d6d69cf69
parentcfad4f46b2d53f67722f7b8046b673d60a9cefcd
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs