Merge remote-tracking branch 'upstream/develop' into hide-reactions

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc docs/configuration/cheatsheet.md
index 2971ea324ff158571914b59b8c959c30668c61ed,d6a9276eeb6f7613b3c61f79c11da79ca3df156d..9c768abef356cfbe2ed633a4b5254c14090d00a6
--- 1/docs/configuration/cheatsheet.md
--- 2/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@@ -58,9 -59,9 +59,10 @@@ To add configuration to your config fil
  * `max_remote_account_fields`: The maximum number of custom fields in the remote user profile (default: `20`).
  * `account_field_name_length`: An account field name maximum length (default: `512`).
  * `account_field_value_length`: An account field value maximum length (default: `2048`).
+ * `registration_reason_length`: Maximum registration reason length (default: `500`).
  * `external_user_synchronization`: Enabling following/followers counters synchronization for external users.
  * `cleanup_attachments`: Remove attachments along with statuses. Does not affect duplicate files and attachments without status. Enabling this will increase load to database when deleting statuses on larger instances.
 +* `show_reactions`: Let favourites and emoji reactions be viewed through the API (default: `true`).
  
  ## Welcome
  * `direct_message`: - welcome message sent as a direct message.