Merge branch 'develop' into global-status-expiration
authorEgor Kislitsyn <egor@kislitsyn.com>
Tue, 5 May 2020 10:28:54 +0000 (14:28 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Tue, 5 May 2020 10:28:54 +0000 (14:28 +0400)
commitdecaa64f75f8bd69622fa5fba757f99719f09808
tree52d3bfc7318230beae31865c7f0a12e02b7f68b5
parent764b4f95a8e9e751d5a6136fc2be44d61a082443
parentc297667f16db40654bb16608c01dc4a2dc7c0e4b
Merge branch 'develop' into global-status-expiration
CHANGELOG.md
config/config.exs
config/description.exs
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/common_api/common_api.ex
test/web/activity_pub/activity_pub_test.exs