Merge branch 'develop' into global-status-expiration
authorEgor Kislitsyn <egor@kislitsyn.com>
Fri, 10 Apr 2020 10:20:48 +0000 (14:20 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Fri, 10 Apr 2020 10:20:48 +0000 (14:20 +0400)
commit7f692343c80ddf353712490edfbcdb14866f5685
tree7ef90078d87fafb1eb25986c92af17a9eede37be
parentfc2eb1fbd6a5b38a3cf72e557cce1029d6b7f16f
parentce089615e1e89fbb63b0c0548906f3b6c22abac2
Merge branch '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