…nto develop

* 'develop' of https://github.com/RocketChat/Rocket.Chat: (83 commits)
  Fix invalid develop payload to release service (RocketChat#17799)
  Readme: Update Raspberry Pi 2 to Pi 4 (RocketChat#17031)
  [NEW] Accept variable `#{userdn}` on LDAP group filter (RocketChat#16273)
  [FIX] Spotify embed link opens in same tab (RocketChat#13637)
  [FIX] Markdown links not accepting URLs with parentheses (RocketChat#13605)
  [NEW][API] Endpoint `settings.addCustomOAuth` to create Custom OAuth services (RocketChat#14912)
  [IMPROVE] Make the implementation of custom code easier by having placeholders for a custom folder (RocketChat#15106)
  [NEW] Skip Export Operations that haven't been updated in over a day (RocketChat#16135)
  [NEW] Highlight matching words in message search results (RocketChat#16166)
  [FIX] Set `x-content-type-options: nosniff` header (RocketChat#16232)
  [FIX] Disabling `Json Web Tokens protection to file uploads` disables the File Upload protection entirely (RocketChat#16262)
  Fixes some italian word (RocketChat#14008)
  Submit a payload to the release service when a release happens (RocketChat#17775)
  Bump version to 3.4.0-develop
  Bump version to 3.3.0
  Bump version to 3.3.0-rc.4
  Regression: Fix Unread bar design (RocketChat#17750)
  Regression: Adjusting spaces between OAuth login buttons (RocketChat#17745)
  Improved thread margins for clarity
  Bump version to 3.3.0-rc.3
  ...

� Conflicts:
�	app/theme/client/imports/general/variables.css
�	app/ui-sidenav/client/sideNav.html

…/new-threads

* 'develop' of github.com:RocketChat/Rocket.Chat: (38 commits)
  [IMPROVE][Federation] Add support for _tcp and protocol DNS entries (#17818)
  Fix the update check not working (#17809)
  Add Apps-Engine to Engine Versions on History (#17810)
  [FIX] Link preview containing HTML encoded chars (#16512)
  [FIX] Email link "go to message" being incorrectly escaped (#17803)
  [FIX] Error when re-installing an App (#17789)
  Update Apps-Engine version (#17804)
  Fix invalid develop payload to release service (#17799)
  Readme: Update Raspberry Pi 2 to Pi 4 (#17031)
  [NEW] Accept variable `#{userdn}` on LDAP group filter (#16273)
  [FIX] Spotify embed link opens in same tab (#13637)
  [FIX] Markdown links not accepting URLs with parentheses (#13605)
  [NEW][API] Endpoint `settings.addCustomOAuth` to create Custom OAuth services (#14912)
  [IMPROVE] Make the implementation of custom code easier by having placeholders for a custom folder (#15106)
  [NEW] Skip Export Operations that haven't been updated in over a day (#16135)
  [NEW] Highlight matching words in message search results (#16166)
  [FIX] Set `x-content-type-options: nosniff` header (#16232)
  [FIX] Disabling `Json Web Tokens protection to file uploads` disables the File Upload protection entirely (#16262)
  Fixes some italian word (#14008)
  Bump version to 3.4.0-develop
  ...

…rewrite_admin_sidebar

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [FIX] When the message is too long declining to send as an attachment does not restore the content into the composer (#16332)
  [IMPROVE][Federation] Add support for _tcp and protocol DNS entries (#17818)
  Fix the update check not working (#17809)
  Add Apps-Engine to Engine Versions on History (#17810)
  [FIX] Link preview containing HTML encoded chars (#16512)
  [FIX] Email link "go to message" being incorrectly escaped (#17803)
  [FIX] Error when re-installing an App (#17789)
  Update Apps-Engine version (#17804)
  Fix invalid develop payload to release service (#17799)

The payload sent to the release service contains an invalid reference to the tag/version and wasn't working when building develop branch.