Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 13 Sep 2021 15:14:58 +0000 (16:14 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 13 Sep 2021 15:14:58 +0000 (16:14 +0100)
commitbd9c9136f9c25ed36b443f0a1985926e1420de7b
tree7a071361277c84e708d6497d68862f2e821357fc
parent1aab9b94b177a8361d25b9bc97ae4d17f3c34a16
parent6b3842cf50c063a63980c8d4dca93b25424059f2
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
priv/static/static/stickers.json