Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 23 Jan 2020 11:55:07 +0000 (11:55 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 23 Jan 2020 11:55:07 +0000 (11:55 +0000)
commit4646d3c9d655b82742fe5e4c397a534ec491d2e1
tree67ffef11f6c0236efb86ba13193e3973acd81819
parent4e069ce53776e99f243adb61969546bed5f2c3fd
parentdddebee047efc4ab1dff6565bef32954695846a7
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs
mix.exs
mix.lock