Merge remote-tracking branch 'upstream/develop' into feature/move-activity
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 14 Nov 2019 09:39:45 +0000 (16:39 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 14 Nov 2019 09:39:45 +0000 (16:39 +0700)
commit3c0abfca53751624ebd6ea7174ee880d9e7b29e7
treeba16c5af44532a9b76640f1f48651c90d1be8a6f
parent768c1a5de172151beb34e6dda13d4fb05e05ed87
parent6085c71bd17e2b676e0820bf3fd93f81a1902ac3
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
CHANGELOG.md
docs/API/differences_in_mastoapi_responses.md
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
priv/static/schemas/litepub-0.1.jsonld
test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/transmogrifier_test.exs