Merge remote-tracking branch 'origin/develop' into global-status-expiration
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 12 Mar 2020 12:02:24 +0000 (16:02 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 12 Mar 2020 12:02:24 +0000 (16:02 +0400)
commitd1c7f8e576e31487544b57d67802843b8ef38388
tree891a5578ef2ad9d48230432d32b9e85cf9d575fc
parent0f386110c6e15148ff1ff5ea3451885485fcb7ff
parent00d17520314e3591caaa7ab4ca39c6227a6bdf15
Merge remote-tracking branch 'origin/develop' into global-status-expiration
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/mrf.ex
lib/pleroma/web/common_api/activity_draft.ex
lib/pleroma/web/common_api/common_api.ex