aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api_controller.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2019-02-28 07:35:26 +0000
committerlambda <pleromagit@rogerbraun.net>2019-02-28 07:35:26 +0000
commit9cc98b496ee378a2d6459b080e1d0067ac216911 (patch)
treea922bd23f4aade28e0aa1dc1a9939ec732da55fa /lib/pleroma/web/twitter_api/twitter_api_controller.ex
parent14bc6bd40f0ea7879cd75444939669ee6e6ac85c (diff)
parent153664096255208055ae2e0b31ea20238ad540b2 (diff)
downloadpleroma-9cc98b496ee378a2d6459b080e1d0067ac216911.tar.gz
Merge branch 'feature/mastoapi-embedded-relationships' into 'develop'
mastodon api: embed relationship card under account card for Pleroma FE convenience See merge request pleroma/pleroma!870
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
0 files changed, 0 insertions, 0 deletions