projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12f0ad1 11a1241)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Fri, 4 May 2018 21:16:16 +0000 (23:16 +0200)
committerlain <lain@soykaf.club>
Fri, 4 May 2018 21:16:16 +0000 (23:16 +0200)

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