Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 3 Mar 2020 11:16:59 +0000 (11:16 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 3 Mar 2020 11:16:59 +0000 (11:16 +0000)
commit3508f698b9b51a86ccc5014f83f9b6c89ba58b0d
tree53288127136403841e0e41ea7ccbd8e9c6e1cb0a
parent4709928b067c45a0408f02e2264bd3f5d88cece1
parent4c02e049358441529c54a72cd11f1c81ee897d49
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
18 files changed:
.gitignore
config/config.exs
lib/mix/tasks/pleroma/user.ex
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
priv/static/index.html
priv/static/static/font/fontello.1583234165126.eot
priv/static/static/font/fontello.1583234165126.svg
priv/static/static/font/fontello.1583234165126.ttf
priv/static/static/font/fontello.1583234165126.woff
priv/static/static/font/fontello.1583234165126.woff2
priv/static/static/fontello.1583234165126.css
priv/static/static/js/app.2e9fe4f1945e5892d651.js
priv/static/static/js/app.2e9fe4f1945e5892d651.js.map
priv/static/static/js/vendors~app.de343579e844e698d456.js
priv/static/static/js/vendors~app.de343579e844e698d456.js.map
priv/static/static/styles.json
priv/static/static/themes/ihatebeingalive.json
priv/static/sw-pleroma.js