Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 18 Apr 2020 15:16:27 +0000 (16:16 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 18 Apr 2020 15:16:27 +0000 (16:16 +0100)
commiteee32fd993f038a2b425f4d4f9bea8ff2d6c7b62
tree4c1c5e2f53c5df14ee41870c7672430992bc9ef3
parentbc6f1705f533521fa477aeb6db5c04334f7e23a9
parent79445ae5d25d7d0f775107eeede167dfd9aeb1bf
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
12 files changed:
config/config.exs
priv/static/index.html
priv/static/static/font/fontello.1587222923489.eot
priv/static/static/font/fontello.1587222923489.svg
priv/static/static/font/fontello.1587222923489.ttf
priv/static/static/font/fontello.1587222923489.woff
priv/static/static/font/fontello.1587222923489.woff2
priv/static/static/fontello.1587222923489.css
priv/static/static/js/app.2156f8b23e368ba319e5.js
priv/static/static/js/app.2156f8b23e368ba319e5.js.map
priv/static/static/static-fe.css
priv/static/sw-pleroma.js