Merge remote-tracking branch 'origin/develop' into global-status-expiration
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 1 Jun 2020 11:48:51 +0000 (15:48 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 1 Jun 2020 11:48:51 +0000 (15:48 +0400)
commita7627bdc7ae67a5c103f968eea02d6b1cf1ef8da
treee12af401307cfc3120d50c01580cd959f3b2503a
parentdecaa64f75f8bd69622fa5fba757f99719f09808
parente96765df6b04fe5e9766271a9c62e559392758b2
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/activity_draft.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