Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
authorAlex Gleason <alex@alexgleason.me>
Mon, 31 May 2021 21:49:46 +0000 (16:49 -0500)
committerAlex Gleason <alex@alexgleason.me>
Mon, 31 May 2021 21:49:46 +0000 (16:49 -0500)
commitf2134e605b44c300505f81adab01354a1652b2e5
tree47ddcf95309646ea005bc9a5b085b1f5e58755e6
parent51a9f97e87823cbd9e92c375f4bc4c0bfa8b79db
parenta0ba44904a9cdf6dea100e5a91bc30b34485d32d
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
20 files changed:
lib/pleroma/application.ex
lib/pleroma/formatter.ex
lib/pleroma/object.ex
lib/pleroma/upload.ex
lib/pleroma/user.ex
lib/pleroma/web/feed/feed_view.ex
lib/pleroma/web/mastodon_api/views/instance_view.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/media_proxy.ex
lib/pleroma/web/templates/feed/feed/_activity.atom.eex
lib/pleroma/web/templates/feed/feed/_activity.rss.eex
lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
lib/pleroma/web/web_finger.ex
test/pleroma/user_test.exs
test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
test/pleroma/web/admin_api/controllers/user_controller_test.exs
test/pleroma/web/common_api_test.exs
test/pleroma/web/mastodon_api/views/account_view_test.exs
test/pleroma/web/media_proxy_test.exs
test/pleroma/web/web_finger_test.exs