Merge remote-tracking branch 'origin/develop' into reactions
authorlain <lain@soykaf.club>
Sat, 5 Oct 2019 13:10:57 +0000 (15:10 +0200)
committerlain <lain@soykaf.club>
Sat, 5 Oct 2019 13:10:57 +0000 (15:10 +0200)
commit1ed8fbc4d96c1d44ab968d6aa1b0069c55e44626
treeb86cb69103fba795ee7dc0f8b3753fb322f79032
parentd9aaea44ff02d6a07d3be0f0675830eb51ac85ef
parente51c20f28a91028b06a5783601e4ce09536bba5b
Merge remote-tracking branch 'origin/develop' into reactions
test/web/pleroma_api/controllers/pleroma_api_controller_test.exs