Merge branch 'twitter-api-bios' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 21 Aug 2018 16:55:26 +0000 (16:55 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 21 Aug 2018 16:55:26 +0000 (16:55 +0000)
commit5a8bb3cb3b0cc7de82bd699d68519593349fee53
treed5987639430bf584a8744b677f623e1efad4e36a
parentc1b8a6a73bfd5f30d5a290b9700ed4d41064ce77
parente883587cc3a0c386e3cc3f63c2d8a2d64f7c953b
Merge branch 'twitter-api-bios' into 'develop'

Twitter API: Support Mastodon-style bios

See merge request pleroma/pleroma!283