Merge branch 'develop' into global-status-expiration
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 20 Apr 2020 16:37:56 +0000 (20:37 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 20 Apr 2020 16:37:56 +0000 (20:37 +0400)
commit364eecc49f137ae3c7798ad240983591e27b134c
tree7ed228221db9794b0aae59fa0e548623c0aa12ae
parentdc8fa04192cc133749e762b78ec043e0902d046d
parent28165dad3ac02a6d3ba4b0cda51992a1831515dd
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/activity_draft.ex
lib/pleroma/web/common_api/common_api.ex
test/web/activity_pub/activity_pub_test.exs