Merge branch 'follow-request-count' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 18 Feb 2019 04:01:26 +0000 (04:01 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 18 Feb 2019 04:01:26 +0000 (04:01 +0000)
commitcd019a5927059bb52447add43a9b29893928c416
treef9a78a61375bb9074664dd9e9925c797ce05b732
parent3f38a055715a8140524f4f55073d5b936d076fb4
parentecdf0657ba4a90d821d3874c827593963e0ff041
Merge branch 'follow-request-count' into 'develop'

Follow request count

See merge request pleroma/pleroma!817
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/twitter_api/twitter_api_controller_test.exs