Merge remote-tracking branch 'origin/develop' into global-status-expiration
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 2 Mar 2020 20:32:34 +0000 (00:32 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 2 Mar 2020 20:32:34 +0000 (00:32 +0400)
commit0f386110c6e15148ff1ff5ea3451885485fcb7ff
tree8a4dcbede6c674730980e1fafa5b956518170a14
parent011ede45361096f55dda938078e24574cdf33b2b
parent4c02e049358441529c54a72cd11f1c81ee897d49
Merge remote-tracking branch 'origin/develop' into global-status-expiration
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/cheatsheet.md
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/common_api/common_api.ex
test/web/activity_pub/activity_pub_test.exs
test/workers/cron/purge_expired_activities_worker_test.exs