From: lambda <pleromagit@rogerbraun.net>
Date: Tue, 5 Dec 2017 11:27:11 +0000 (+0000)
Subject: Merge branch 'feature/chat' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=08e7e249b1e656bce79fec7df4ce8bf9b158855f;p=akkoma

Merge branch 'feature/chat' into 'develop'

Feature/chat

See merge request pleroma/pleroma!36
---

08e7e249b1e656bce79fec7df4ce8bf9b158855f