# Conflicts:
#	packages/rocketchat-ui-flextab/flex-tab/flexTabBar.coffee
#	packages/rocketchat-ui/views/app/room.coffee

LingoHub based on develop

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

Made with  by https://lingohub.com

Added additional options to docker-compose.yml

Adding Rocket.Chat templates to deploy on OpenShift

Set max width on author icon

On JIRA the default icons are svgs. When trying to use thistthe image appears in the middle of the chat window with a size of 16x16 because of the `max-height` restriction. By setting `max-width` as well it appears on the left, where it should.

# Conflicts:
#	server/methods/canAccessRoom.coffee

Added options for MAIL and PROXY