Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 9 Sep 2020 08:35:48 +0000 (09:35 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 9 Sep 2020 08:35:48 +0000 (09:35 +0100)
commitd0ffefc2702814b8d1724a1e23caad2a6d326804
treee1100fdb60954abb6045ce4ed67be96044bf25c7
parent1c44d476e72cfbfa3f2a5c88524cb702c55ec143
parent7c055af567e08be7f171a2fb687926bef5920899
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs