Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 29 Jan 2020 11:05:19 +0000 (11:05 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 29 Jan 2020 11:05:19 +0000 (11:05 +0000)
commit646016c403f6ed10f00f9c67b477a231f71aa706
tree5c7ad743176962e3f9c0f12498e875421602fbce
parentff552c51511e80ebaaafcad9a8c06bb6120428d5
parent9e0c2413b4c2382d3a17eb7fc33ab6ed2ba26b2a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
22 files changed:
config/config.exs
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
mix.exs
mix.lock
priv/static/index.html
priv/static/static/config.json
priv/static/static/font/fontello.1580295842879.eot
priv/static/static/font/fontello.1580295842879.svg
priv/static/static/font/fontello.1580295842879.ttf
priv/static/static/font/fontello.1580295842879.woff
priv/static/static/font/fontello.1580295842879.woff2
priv/static/static/font/lato-v15-latin-regular.eot
priv/static/static/font/lato-v15-latin-regular.svg
priv/static/static/font/lato-v15-latin-regular.ttf
priv/static/static/font/lato-v15-latin-regular.woff
priv/static/static/font/lato-v15-latin-regular.woff2
priv/static/static/fontello.1580295842879.css
priv/static/static/js/app.8457067449d0acdd01fc.js
priv/static/static/js/app.8457067449d0acdd01fc.js.map
priv/static/static/styles.json
priv/static/static/terms-of-service.html
priv/static/sw-pleroma.js