# Conflicts:
#	packages/rocketchat-channel-settings/client/views/channelSettings.coffee
#	packages/rocketchat-channel-settings/client/views/channelSettings.html
#	packages/rocketchat-channel-settings/server/methods/saveRoomSettings.coffee
#	packages/rocketchat-lib/server/methods/addUserToRoom.coffee
#	packages/rocketchat-ui/views/app/room.coffee
#	server/methods/createChannel.coffee
#	server/methods/createPrivateGroup.coffee
#	server/methods/joinRoom.coffee
#	server/startup/roomPublishes.coffee

Add setting to disable LDAP fallback to default account system

Fix error with CustomOAuth on startup

Phabricator support

Closes #4177

Fix an exception occuring in the smarsh connector when a user didn't have an email, adds a setting to configure the default email for missing emails

Fix the generateEml throwing an error when the message type isn't defined and fix a conflict of the saveSetting.coffee being added back in when it was removed

Conflicts:
	packages/rocketchat-lib/server/methods/saveSetting.coffee

#4121 models base.update throws error

Fix resize of message box on mobile when paste and send using `return` on keyboard

Disable unessary fields on push settings