# Conflicts:
#	HISTORY.md
#	packages/rocketchat-i18n/i18n/en.i18n.json
#	packages/rocketchat-ui-sidenav/client/channels.coffee
#	packages/rocketchat-ui-sidenav/client/chatRoomItem.coffee
#	packages/rocketchat-ui-sidenav/client/combined.coffee
#	packages/rocketchat-ui-sidenav/client/directMessages.coffee
#	packages/rocketchat-ui-sidenav/client/privateGroups.coffee
#	packages/rocketchat-ui-sidenav/client/starredRooms.coffee
#	packages/rocketchat-ui-sidenav/client/unreadRooms.coffee

LingoHub based on develop

[NEW] Add a setting to not run outgoing integrations on message edits

Manual push by LingoHub User: Gabriel Engel.
Project: Rocket.Chat

Made with  by https://lingohub.com

[FIX] Update server cache indexes on record updates

[FIX] Allow question on OAuth token path

* check for overridden environment variable

fixes #6161

* Environment variable overriding a setting

Fixes #6161

[FIX] Error when returning undefined from incoming intergation’s script

[FIX] Fix Logger stdout publication

[FIX] Downgrade email package to from 1.2.0 to 1.1.18

[NEW] Expose Livechat to Incoming Integrations and allow response

[FIX] Administrators being rate limited when editing users data

Related #6678

[NEW] Drupal oAuth Integration for Rocketchat

[NEW] Add monitoring package

[FIX] Improve markdown code

[FIX] Encode avatar url to prevent CSS injection

Added Deploy method and platform to stats

[FIX] Do not escaping markdown on message attachments