projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 266d9c0 2247d75)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorRoger Braun <rbraun@Bobble.local>
Thu, 9 Nov 2017 15:49:32 +0000 (16:49 +0100)
committerRoger Braun <rbraun@Bobble.local>
Thu, 9 Nov 2017 15:49:32 +0000 (16:49 +0100)

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