Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 9 Nov 2019 19:11:33 +0000 (19:11 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 9 Nov 2019 19:11:33 +0000 (19:11 +0000)
commit55cc96bcf9331b8b56c64251cec0878529a543a6
treea65a4c1dcb8b63390d2724523bdb4aedfe9d1a42
parent058467d25cc74ea26aa0a7f232fb2c4b96fa9bdd
parent8a03ce50ea30df3754f2d9856829b036c878e063
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
mix.exs
priv/static/index.html
priv/static/static/styles.json
priv/static/sw-pleroma.js