projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1f79c0 29c9812)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorLain Iwakura <lain@soykaf.club>
Tue, 19 Dec 2017 15:15:45 +0000 (16:15 +0100)
committerLain Iwakura <lain@soykaf.club>
Tue, 19 Dec 2017 15:15:45 +0000 (16:15 +0100)

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