Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discover...

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index 6caed11237c50aa2ffe6380e6000510987110f1a,fc4013fc3358e766c0d6effb6843dfc8cc5e190c..fe9b2b4d1c932c8ff6b16b33c5ba1f92c2def030
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -34,13 -35,10 +35,12 @@@ The format is based on [Keep a Changelo
  
  ### Fixed
  
 -- <details>
 +- Users with `is_discoverable` field set to false (default value) will appear in in-service search results but be hidden from external services (search bots etc.).
 +
 +<details>
    <summary>API Changes</summary>
- - Mastodon API: Current user is now included in conversation if it's the only participant.
- - Mastodon API: Fixed last_status.account being not filled with account data.
- 
+   - Mastodon API: Current user is now included in conversation if it's the only participant.
+   - Mastodon API: Fixed last_status.account being not filled with account data.
  </details>
  
  ## Unreleased (Patch)