Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 20 Feb 2020 13:50:56 +0000 (13:50 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 20 Feb 2020 13:50:56 +0000 (13:50 +0000)
commitfae0d4ba9d63e5dffc4fee97da09d1ca3b320e04
treef9bfc9e58ca86f35b5a53f43c825d4a5b589807f
parent1b03dc20311867cc061e1e2f1e5fc615b30ee161
parent3eddd9caa61a2ac431eb57cd4c835db608702a7d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
93 files changed:
config/config.exs
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
priv/static/index.html
priv/static/static/css/app.1055039ce3f2fe4dd110.css
priv/static/static/css/app.1055039ce3f2fe4dd110.css.map
priv/static/static/css/app.ae04505b31bb0ee2765e.css.map
priv/static/static/css/base16-3024.css
priv/static/static/css/base16-apathy.css
priv/static/static/css/base16-ashes.css
priv/static/static/css/base16-atelier-cave.css
priv/static/static/css/base16-atelier-dune.css
priv/static/static/css/base16-atelier-estuary.css
priv/static/static/css/base16-atelier-forest.css
priv/static/static/css/base16-atelier-heath.css
priv/static/static/css/base16-atelier-lakeside.css
priv/static/static/css/base16-atelier-plateau.css
priv/static/static/css/base16-atelier-savanna.css
priv/static/static/css/base16-atelier-seaside.css
priv/static/static/css/base16-atelier-sulphurpool.css
priv/static/static/css/base16-bespin.css
priv/static/static/css/base16-brewer.css
priv/static/static/css/base16-bright.css
priv/static/static/css/base16-chalk.css
priv/static/static/css/base16-codeschool.css
priv/static/static/css/base16-darktooth.css
priv/static/static/css/base16-default-dark.css
priv/static/static/css/base16-default-light.css
priv/static/static/css/base16-eighties.css
priv/static/static/css/base16-embers.css
priv/static/static/css/base16-flat.css
priv/static/static/css/base16-github.css
priv/static/static/css/base16-google-dark.css
priv/static/static/css/base16-google-light.css
priv/static/static/css/base16-grayscale-dark.css
priv/static/static/css/base16-grayscale-light.css
priv/static/static/css/base16-green-screen.css
priv/static/static/css/base16-harmonic16-dark.css
priv/static/static/css/base16-harmonic16-light.css
priv/static/static/css/base16-hopscotch.css
priv/static/static/css/base16-ir-black.css
priv/static/static/css/base16-isotope.css
priv/static/static/css/base16-london-tube.css
priv/static/static/css/base16-macintosh.css
priv/static/static/css/base16-marrakesh.css
priv/static/static/css/base16-materia.css
priv/static/static/css/base16-mexico-light.css
priv/static/static/css/base16-mocha.css
priv/static/static/css/base16-monokai.css
priv/static/static/css/base16-ocean.css
priv/static/static/css/base16-oceanicnext.css
priv/static/static/css/base16-paraiso.css
priv/static/static/css/base16-phd.css
priv/static/static/css/base16-pico.css
priv/static/static/css/base16-pleroma-dark.css
priv/static/static/css/base16-pleroma-light.css
priv/static/static/css/base16-pop.css
priv/static/static/css/base16-railscasts.css
priv/static/static/css/base16-seti-ui.css
priv/static/static/css/base16-shapeshifter.css
priv/static/static/css/base16-solar-flare.css
priv/static/static/css/base16-solarized-dark.css
priv/static/static/css/base16-solarized-light.css
priv/static/static/css/base16-spacemacs.css
priv/static/static/css/base16-summerfruit-dark.css
priv/static/static/css/base16-summerfruit-light.css
priv/static/static/css/base16-tomorrow-night.css
priv/static/static/css/base16-tomorrow.css
priv/static/static/css/base16-twilight.css
priv/static/static/css/base16-unikitty-dark.css
priv/static/static/css/base16-unikitty-light.css
priv/static/static/css/themes.json
priv/static/static/font/fontello.1582206587591.eot
priv/static/static/font/fontello.1582206587591.svg
priv/static/static/font/fontello.1582206587591.ttf
priv/static/static/font/fontello.1582206587591.woff
priv/static/static/font/fontello.1582206587591.woff2
priv/static/static/fontello.1582206587591.css
priv/static/static/js/2.9be9f9ec29f7536c73c3.js
priv/static/static/js/2.e44dd0959c37a28ce531.js
priv/static/static/js/2.e44dd0959c37a28ce531.js.map
priv/static/static/js/app.6a317a7bca161d1a49d2.js
priv/static/static/js/app.6a317a7bca161d1a49d2.js.map
priv/static/static/js/vendors~app.3030a9fca79d649e2964.js
priv/static/static/js/vendors~app.3030a9fca79d649e2964.js.map
priv/static/static/styles.json
priv/static/static/terms-of-service.html
priv/static/static/themes/breezy-dark.json
priv/static/static/themes/breezy-light.json
priv/static/static/themes/paper.json
priv/static/static/themes/redmond-xx-se.json
priv/static/static/themes/redmond-xx.json
priv/static/static/themes/redmond-xxi.json
priv/static/sw-pleroma.js