projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bf269f 065a4dd)
Merge branch 'stable-sync/2.1.2' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 17 Sep 2020 19:42:42 +0000 (19:42 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 17 Sep 2020 19:42:42 +0000 (19:42 +0000)
Sync develop with 2.1.2

Closes #2133, #2131, and #2130

See merge request pleroma/pleroma!3007


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