From: lain Date: Mon, 6 Jul 2020 10:07:56 +0000 (+0200) Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe... X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ed4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548;p=akkoma Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json --- ed4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548