Merge branch 'feature/chat' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 5 Dec 2017 11:27:11 +0000 (11:27 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 5 Dec 2017 11:27:11 +0000 (11:27 +0000)
commit08e7e249b1e656bce79fec7df4ce8bf9b158855f
tree6ffaad6b46925bd1bf5f5aff53437df7ed0528b1
parent7f336cb8b102c4dd5045aceebedafa1ca363bd91
parente7c2472abd470b3b0ba8e9321a378e5a77412e26
Merge branch 'feature/chat' into 'develop'

Feature/chat

See merge request pleroma/pleroma!36