kaniini 0f5bff8c66 Merge branch 'develop' into 'feature/relay' ...

# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex

2018-08-26 21:06:15 +00:00

..

representers

twitter api: provide object descriptions as attachment description field

2018-08-25 00:12:58 +00:00

views

this should be looking at the follower's bio, not the user's bio.

2018-08-21 15:25:21 +01:00

twitter_api_controller_test.exs

…

twitter_api_test.exs

…