Merge remote-tracking branch 'origin' into follower-hiding
authorlain <lain@soykaf.club>
Wed, 5 Dec 2018 20:27:56 +0000 (21:27 +0100)
committerlain <lain@soykaf.club>
Wed, 5 Dec 2018 20:27:56 +0000 (21:27 +0100)
commit76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed
tree5308f2d4c169085dfbe22a95a86c5271e4285ace
parent3ea4476445a5e9b6ec1625d7caa537f79254e9d0
parent5f0c2372bc8be3763b649b13ee142c273583329e
Merge remote-tracking branch 'origin' into follower-hiding
lib/pleroma/user/info.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/activity_pub/activity_pub_controller_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/twitter_api/twitter_api_controller_test.exs