Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 10 Sep 2019 20:11:03 +0000 (21:11 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 10 Sep 2019 20:11:03 +0000 (21:11 +0100)
commit94076a23e40f74256fec507e6236aaff10218277
tree7fef9e3d78310104bc0404ad976bf0be5428bbdb
parent13f1c9474db58ff3e1ad25c90d6b454945bb75f1
parent69800055f1c78c4d45d52ceb111fb717f62a2599
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
priv/static/index.html
priv/static/static/config.json