projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bdb5dd2 2f29157)
Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop
authorCalv Collins <calvcoll@gmail.com>
Thu, 8 Feb 2018 16:58:31 +0000 (16:58 +0000)
committerCalv Collins <calvcoll@gmail.com>
Thu, 8 Feb 2018 16:58:31 +0000 (16:58 +0000)

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