projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2203fa2 3163311)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Fri, 2 Feb 2018 16:14:58 +0000 (17:14 +0100)
committerRoger Braun <roger@rogerbraun.net>
Fri, 2 Feb 2018 16:14:58 +0000 (17:14 +0100)

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