Merge branch 'develop' into global-status-expiration
authorEgor Kislitsyn <egor@kislitsyn.com>
Fri, 24 Apr 2020 14:37:58 +0000 (18:37 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Fri, 24 Apr 2020 14:37:58 +0000 (18:37 +0400)
commitc56c0a3d23929f166f4d95e5c6e96bbf0df8a35e
tree6b6fffe4faeebbf7e103d16a427f6f68774b44d5
parent364eecc49f137ae3c7798ad240983591e27b134c
parent2430b9bf90d6fde71885f5f0f8be767526be6208
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/common_api.ex
test/web/activity_pub/activity_pub_test.exs