Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Fri, 28 Jun 2019 17:55:01 +0000 (18:55 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Fri, 28 Jun 2019 17:55:01 +0000 (18:55 +0100)
commit87ba9d1babfcdbcc4661fb92edc372ef936da39f
treec36846a24ee1f136abad6287e68fee52149c1e50
parent8050baf7bf95e4ce4b98a22df40a12ce9c44e50d
parent456668b490e9ee47cf773a8563a9f3a3765ce348
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
priv/static/index.html
priv/static/sw-pleroma.js