projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 806550c 925fb2f)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Tue, 3 Apr 2018 16:34:07 +0000 (18:34 +0200)
committerlain <lain@soykaf.club>
Tue, 3 Apr 2018 16:34:07 +0000 (18:34 +0200)

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