Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 7 Sep 2020 08:57:00 +0000 (09:57 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 7 Sep 2020 08:57:00 +0000 (09:57 +0100)
commit1c44d476e72cfbfa3f2a5c88524cb702c55ec143
treefe9d70a7391853cb8e8b4187dd575dbb6e75a827
parent7ac5f210ea386b9c0e75626a71fd01c6ef9d4408
parent000c315ee7af9110f77e4cbdeb1a66769b1c4695
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs