Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 12 Dec 2019 17:48:36 +0000 (17:48 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 12 Dec 2019 17:48:36 +0000 (17:48 +0000)
commit803bce3668db5f0fb00e26420b46251537d1c97e
tree4295a51b4d3545e1664d929a8b58e08e0cbee58f
parent97f67e0786c53010e7bf3f126f3de33efc69c3d4
parent8ad6d2784c0b79a50346dfd45fe3f3c0997b3d06
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
priv/static/index.html
priv/static/instance/panel.html
priv/static/static/js/app.a48779d14f1bf30f0cb2.js
priv/static/static/js/app.a48779d14f1bf30f0cb2.js.map
priv/static/static/js/vendors~app.c2e8b58fd92bd16e962b.js
priv/static/static/js/vendors~app.c2e8b58fd92bd16e962b.js.map
priv/static/static/terms-of-service.html
priv/static/sw-pleroma.js