Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe...
authorlain <lain@soykaf.club>
Mon, 6 Jul 2020 10:07:56 +0000 (12:07 +0200)
committerlain <lain@soykaf.club>
Mon, 6 Jul 2020 10:07:56 +0000 (12:07 +0200)
commited4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548
tree82c5e8b4a40495485533b9c95668cef39ce909d2
parenta5bbfa21a1fabe97bfff1cc80348d2944319f3ad
parent69f0b286f7b3e0518ac7ae54dfb06539dc179698
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json