Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote...
authorlain <lain@soykaf.club>
Tue, 28 Jan 2020 16:52:42 +0000 (17:52 +0100)
committerlain <lain@soykaf.club>
Tue, 28 Jan 2020 16:52:42 +0000 (17:52 +0100)
commitcedee2793d96b0384a3041ea0a6cd1f2b1c3dd1e
treedfc1a2b2bb27d845bbde24b023287122f5d39ed7
parentae78059ff433739b83aaa3ccff9245ace153146d
parente8f22451da18aeba9bcf9f9f6acf93690ccb3cba
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect