projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ece4a3 8216d5e)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Mon, 28 May 2018 10:39:49 +0000 (12:39 +0200)
committerlain <lain@soykaf.club>
Mon, 28 May 2018 10:39:49 +0000 (12:39 +0200)

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