Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 13 Aug 2020 19:03:33 +0000 (20:03 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 13 Aug 2020 19:03:33 +0000 (20:03 +0100)
commit735ceb2115809037006d870ce8f8fb27c444bb56
tree801d8005cb80a5671c6f0ee6bb8e02330d8a9019
parent992deaa09bea1ed30f5a0e8bc357e27e4fd45be4
parent14a06e63f661cc964a799a62c87103a00ba0c5e0
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
.gitignore
config/config.exs