Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 16 Jan 2020 16:17:56 +0000 (16:17 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 16 Jan 2020 16:17:56 +0000 (16:17 +0000)
commit4e069ce53776e99f243adb61969546bed5f2c3fd
treee697131bc003bbffacaa62d06a564bbfa2dc14a4
parent5664427d6cac372758ee0b086aa4333b67093826
parent52a0bf62f51d689cdc6f108cbefcb244a4a3737f
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.1579191413379.eot
priv/static/static/font/fontello.1579191413379.svg
priv/static/static/font/fontello.1579191413379.ttf
priv/static/static/font/fontello.1579191413379.woff
priv/static/static/font/fontello.1579191413379.woff2
priv/static/static/fontello.1579191413379.css
priv/static/static/js/app.eb7444df7c8e44e553de.js
priv/static/static/js/app.eb7444df7c8e44e553de.js.map
priv/static/static/styles.json
priv/static/sw-pleroma.js