Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 15 Nov 2019 18:40:14 +0000 (21:40 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 15 Nov 2019 18:40:14 +0000 (21:40 +0300)
commit01d9c093c3fa06784ee24039c69b16e400dd0ebf
treead013076e4b54a242fd895550a0fe50a1786f9b9
parentc31ddce51ea18f052c1c3ad30a221b77c7a94e71
parent22554ac5ca056c2db627fc2daa5ffc8710be5c89
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
test/user_test.exs
test/web/activity_pub/activity_pub_test.exs