Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 8 Mar 2020 19:07:55 +0000 (19:07 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 8 Mar 2020 19:07:55 +0000 (19:07 +0000)
commit5f625c91361f68186a95354bbcff108435ce4d07
tree66373e4e6e0486774cd1d32a553f04d079796909
parent3508f698b9b51a86ccc5014f83f9b6c89ba58b0d
parent663e46606711720bac7bce5e1c89fb0f11e77e50
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
priv/static/index.html
priv/static/static/font/fontello.1583694403265.eot
priv/static/static/font/fontello.1583694403265.svg
priv/static/static/font/fontello.1583694403265.ttf
priv/static/static/font/fontello.1583694403265.woff
priv/static/static/font/fontello.1583694403265.woff2
priv/static/static/fontello.1583694403265.css
priv/static/static/js/app.a39dbef9004abe6273c9.js
priv/static/static/js/app.a39dbef9004abe6273c9.js.map
priv/static/sw-pleroma.js