Merge branch 'develop' into features/remove-user-source_data
authorrinpatch <rinpatch@sdf.org>
Thu, 16 Apr 2020 18:28:52 +0000 (21:28 +0300)
committerrinpatch <rinpatch@sdf.org>
Thu, 16 Apr 2020 18:28:52 +0000 (21:28 +0300)
commit942d7467ca28c898f914539ae85ea3044c36ebbc
tree03d909dfcf5974838919076c6ae994515b0c1f84
parente89078ac2a27bb0a833c982dbb5eef63ddea3cc0
parent252528a4b9ca3a5d92f1676c44989ad7d8777de1
Merge branch 'develop' into features/remove-user-source_data
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
test/user_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/activity_pub/views/user_view_test.exs
test/web/common_api/common_api_test.exs