projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad0ab3a 2f23ae5)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Tue, 30 Jan 2018 11:21:05 +0000 (12:21 +0100)
committerRoger Braun <roger@rogerbraun.net>
Tue, 30 Jan 2018 11:21:05 +0000 (12:21 +0100)

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