Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only...
authorlain <lain@soykaf.club>
Wed, 4 Nov 2020 10:47:41 +0000 (11:47 +0100)
committerlain <lain@soykaf.club>
Wed, 4 Nov 2020 10:47:41 +0000 (11:47 +0100)
commitc7bcbfbc1d5d34463634e44979a77a2c47e35dbc
treea9d947e8f3c82b7c5cd1764d98be46cf95b7e085
parent1cc8e945064319014300de5880a326d1100bf43e
parentba3f3a5a56d4a5ac05443fd30b5864778ad1131e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
CHANGELOG.md
lib/pleroma/activity.ex
lib/pleroma/web/common_api.ex