Merge branch 'develop' into global-status-expiration
authorEgor Kislitsyn <egor@kislitsyn.com>
Tue, 28 Apr 2020 10:13:53 +0000 (14:13 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Tue, 28 Apr 2020 10:13:53 +0000 (14:13 +0400)
commit764b4f95a8e9e751d5a6136fc2be44d61a082443
treefbeea45e76ca9053a19dc41e6b02158c222821bf
parentc56c0a3d23929f166f4d95e5c6e96bbf0df8a35e
parent9994768312ede572c4ddd6beda7027b0a2baddce
Merge branch 'develop' into global-status-expiration
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/common_api/activity_draft.ex
test/web/activity_pub/activity_pub_test.exs