projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e341f81 6335b32)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
authorlain <lain@soykaf.club>
Wed, 8 Jul 2020 11:21:58 +0000 (13:21 +0200)
committerlain <lain@soykaf.club>
Wed, 8 Jul 2020 11:21:58 +0000 (13:21 +0200)

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