projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d2814e 5ef840e)
Merge branch 'stable-sync/2.1.1' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Tue, 8 Sep 2020 17:57:02 +0000 (17:57 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 8 Sep 2020 17:57:02 +0000 (17:57 +0000)
Sync stable with develop after 2.1.1

Closes #2, #2047, #2095, #2116, #1987, and #2080

See merge request pleroma/pleroma!2974


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