From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Thu, 19 Nov 2020 16:35:44 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discover... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b27d8f74370ad404a91b15fa1f51ea6162f35098;p=akkoma

Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix

# Conflicts:
#	CHANGELOG.md
---

b27d8f74370ad404a91b15fa1f51ea6162f35098
diff --cc CHANGELOG.md
index 6caed1123,fc4013fc3..fe9b2b4d1
--- a/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)