Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 9 Feb 2020 18:12:40 +0000 (18:12 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 9 Feb 2020 18:12:40 +0000 (18:12 +0000)
commit7de32e2c8b77eba414d376dedfdb8f782847ce46
tree8ce82f517e260f21e789e05f82ab8f743239f471
parent57b3925a886c5c4db49fc96bc3dfaa982fd37833
parent544bdbfb90d764a5aba8ed07c13b842838d76d73
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs
mix.lock
priv/static/index.html
priv/static/sw-pleroma.js