Merge branch 'feature/add-chat-token-to-masto-api' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sat, 15 Jun 2019 09:56:01 +0000 (09:56 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 15 Jun 2019 09:56:01 +0000 (09:56 +0000)
commitfb4af26d75406f557a8b1a8dd388e16865b5bda2
treebe0e4beaddc40d8daeea09f2c94410b2991b677e
parent62ffc00a5d5975a75c905bc728feb71cd15a34d3
parent0632ed2f87671d90d029d435a084a8da72f549ea
Merge branch 'feature/add-chat-token-to-masto-api' into 'develop'

Mastodon API: Return the token needed for the chat.

See merge request pleroma/pleroma!1292