Merge develop
authorRoman Chvanikov <chvanikoff@pm.me>
Sun, 13 Sep 2020 09:24:57 +0000 (12:24 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Sun, 13 Sep 2020 09:24:57 +0000 (12:24 +0300)
commitc5830ac037c0c344bd22b674c41f4dc244a088aa
treed5a02f43337536d05b934bee3012dab319ccc127
parent527afb813af6c64337d02ddf1a2f159fe557acbc
parent88fe0a262e21ba1284e72eddb1d41363dc029aa7
Merge develop
config/config.exs
lib/pleroma/user.ex
lib/pleroma/web/common_api/common_api.ex
test/web/common_api/common_api_test.exs
test/web/mastodon_api/views/account_view_test.exs