projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc42446 6f17aea)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
authorlain <lain@soykaf.club>
Wed, 26 Aug 2020 13:58:49 +0000 (15:58 +0200)
committerlain <lain@soykaf.club>
Wed, 26 Aug 2020 13:58:49 +0000 (15:58 +0200)

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