projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5cce89 ae93465)
Merge branch 'mergeback/2.2.1' into 'develop'
authorlain <lain@soykaf.club>
Wed, 23 Dec 2020 14:08:08 +0000 (14:08 +0000)
committerlain <lain@soykaf.club>
Wed, 23 Dec 2020 14:08:08 +0000 (14:08 +0000)
Mergeback/2.2.1

See merge request pleroma/pleroma!3215


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