Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only...
authorlain <lain@soykaf.club>
Tue, 17 Nov 2020 14:01:38 +0000 (15:01 +0100)
committerlain <lain@soykaf.club>
Tue, 17 Nov 2020 14:01:38 +0000 (15:01 +0100)
commitfec1ed802ef44a700df27aa132146f79e9e4cd6d
tree6bbb39b647305521209bebbd7bdea3e4be012d1c
parent81293e5aadd5f1dfe7f90f6a71f625ef86cf3359
parent9b9afe6b3fde77ef005629fe2d198160c8f465a1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
CHANGELOG.md
docs/API/differences_in_mastoapi_responses.md
lib/pleroma/web/common_api.ex
test/pleroma/web/common_api_test.exs