projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf64208 961f131)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Mon, 21 May 2018 10:09:33 +0000 (12:09 +0200)
committerlain <lain@soykaf.club>
Mon, 21 May 2018 10:09:33 +0000 (12:09 +0200)

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