Merge remote-tracking branch 'upstream/develop' into develop
authorFloatingGhost <hannah@coffee-and-dreams.uk>
Thu, 30 Dec 2021 18:05:22 +0000 (18:05 +0000)
committerFloatingGhost <hannah@coffee-and-dreams.uk>
Thu, 30 Dec 2021 18:05:22 +0000 (18:05 +0000)
commit12a171844b139cd6ea61e24ff9bc7f1b5e41ec51
treeff6e83a490df789edad1ffaeb1daf409e1ccc3aa
parent1863ae59fbec72e634f61fc7f384fa3e00072d07
parente25af3f2d8ee5459d20b67049da8d2e99f5d72a7
Merge remote-tracking branch 'upstream/develop' into develop
config/config.exs
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/side_effects.ex
lib/pleroma/web/endpoint.ex
lib/pleroma/web/mastodon_api/controllers/search_controller.ex
mix.exs
mix.lock