projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14d9de3 b76001d)
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Tue, 20 Jun 2017 15:49:15 +0000 (17:49 +0200)
committerRoger Braun <roger@rogerbraun.net>
Tue, 20 Jun 2017 15:49:15 +0000 (17:49 +0200)

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