# Conflicts:
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	HISTORY.md
#	package.json
#	packages/rocketchat-lib/rocketchat.info
#	tests/end-to-end/api/01-users.js

[FIX] make channels.create API check for create-c

[FIX] Remove spaces from env PORT and INSTANCE_IP

[Fix] Error when trying to show preview of undefined filetype

[NEW] Show info about multiple instances at admin page

[FIX] Compile CSS color variables

[NEW] Improve CI/Docker build/release

[NEW] Add SMTP settings for Protocol and Pool

[FIX] Not showing unread count on electron app’s icon

[FIX] Users status on main menu always offline

[NEW] Add a pointer cursor to message images

[New] Snap ARM support

[FIX] start/unstar message