projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1d529e b9ee17a)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Fri, 30 Mar 2018 12:48:08 +0000 (14:48 +0200)
committerlain <lain@soykaf.club>
Fri, 30 Mar 2018 12:48:08 +0000 (14:48 +0200)

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