projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fde30ae cd127d2)
Merge branch 'conversations-import' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 16 May 2019 18:32:42 +0000 (18:32 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 16 May 2019 18:32:42 +0000 (18:32 +0000)
Conversations import

Closes #871

See merge request pleroma/pleroma!1127


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