projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 651fade 11d8fef)
Merge branch 'sync-stable/2.2.0' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Tue, 17 Nov 2020 12:40:42 +0000 (12:40 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 17 Nov 2020 12:40:42 +0000 (12:40 +0000)
Import stable commits into develop after releasing 2.2.0

Closes #2275, #1516, #2257, #2242, #1668, and #2236

See merge request pleroma/pleroma!3151


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