Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 29 Dec 2020 13:16:14 +0000 (13:16 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 29 Dec 2020 13:16:14 +0000 (13:16 +0000)
commit6cd0586ef9f1991655c7736479a9a1fb39f4098c
tree6a48de375db91c78581db10d2f5e3c177fab7907
parent79472365751aa34d0029a89c0fc002e09a9bbea6
parent607cac1947aaec9ab66de679615b4e14548027a8
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
34 files changed:
.gitignore
config/config.exs
lib/mix/tasks/pleroma/user.ex
lib/pleroma/web/endpoint.ex
priv/static/static/stickers.json
priv/static/static/stickers/omesis/354832542.png
priv/static/static/stickers/omesis/354832543.png
priv/static/static/stickers/omesis/354832544.png
priv/static/static/stickers/omesis/354832545.png
priv/static/static/stickers/omesis/354832546.png
priv/static/static/stickers/omesis/354832547.png
priv/static/static/stickers/omesis/354832548.png
priv/static/static/stickers/omesis/354832549.png
priv/static/static/stickers/omesis/354832550.png
priv/static/static/stickers/omesis/354832551.png
priv/static/static/stickers/omesis/354832552.png
priv/static/static/stickers/omesis/354832553.png
priv/static/static/stickers/omesis/354832554.png
priv/static/static/stickers/omesis/354832555.png
priv/static/static/stickers/omesis/354832556.png
priv/static/static/stickers/omesis/354832557.png
priv/static/static/stickers/omesis/354832558.png
priv/static/static/stickers/omesis/354832559.png
priv/static/static/stickers/omesis/354832560.png
priv/static/static/stickers/omesis/354832561.png
priv/static/static/stickers/omesis/354832562.png
priv/static/static/stickers/omesis/354832563.png
priv/static/static/stickers/omesis/354832564.png
priv/static/static/stickers/omesis/354832565.png
priv/static/static/stickers/omesis/pack.json
priv/static/static/stickers/omesis/productInfo.meta
priv/static/static/stickers/omesis/tab.png
priv/static/static/stickers/omesis/tab_off.png
priv/static/static/stickers/omesis/tab_on.png