projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 360c51f 807d243)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Mon, 2 Apr 2018 13:29:05 +0000 (15:29 +0200)
committerlain <lain@soykaf.club>
Mon, 2 Apr 2018 13:29:05 +0000 (15:29 +0200)

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