Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Fri, 8 May 2020 13:12:33 +0000 (14:12 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Fri, 8 May 2020 13:12:33 +0000 (14:12 +0100)
commite18958a5d7ed2d31026ee921dfcc0501b5d2881b
tree6d5471d16e96fb990454311b10e9389b060d1310
parent9eede61d00daa645f8ab5314f8fe6636f0cbc4a5
parentfbcc53760e6fcd393513c05a5bd7a4a6a6f3b731
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs
lib/mix/tasks/pleroma/activity.ex
lib/mix/tasks/pleroma/user.ex
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
priv/static/index.html
priv/static/sw-pleroma.js