projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67d92ac 69f0b28)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
authorlain <lain@soykaf.club>
Mon, 6 Jul 2020 10:15:59 +0000 (12:15 +0200)
committerlain <lain@soykaf.club>
Mon, 6 Jul 2020 10:15:59 +0000 (12:15 +0200)

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