Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
authorEgor Kislitsyn <egor@kislitsyn.com>
Fri, 5 Jun 2020 19:15:10 +0000 (23:15 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Fri, 5 Jun 2020 19:15:10 +0000 (23:15 +0400)
commitb02df1803e16b40ad8a30465604e2892b6d65e6f
tree8d60100ab9fdb8ebe29b0ceff3655e71570d30bd
parent317e2b8d6126d86eafb493fe6c3b7a29af65ee21
parentd74985af2381b1c0dae2bc9c79c14582e5c61b97
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/controller_helper.ex
lib/pleroma/web/feed/tag_controller.ex
lib/pleroma/web/feed/user_controller.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex