Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 7 Aug 2019 07:59:31 +0000 (08:59 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 7 Aug 2019 07:59:31 +0000 (08:59 +0100)
commit325372b1e1eba6d9a2468678b5bf17c88252b61d
tree0e137d05fae2c1dae542a667a2d9d5c758dd28d7
parent3cc6cb266b7b1dbdbf8f86ee0f7e5a9161bc0e70
parentaa718ab8f6f290f2efb12354aff68b95e84125a4
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
lib/mix/tasks/pleroma/user.ex
priv/static/emoji/sheet_10.png