projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f336cb e7c2472)
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)
Feature/chat

See merge request pleroma/pleroma!36


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git