Merge remote-tracking branch 'origin/master' into release-0.64.0 · RocketChat/Rocket.Chat@6dc6c18 · GitHub

Commit

Merge remote-tracking branch 'origin/master' into release-0.64.0

Browse files

# Conflicts:
#	.docker/Dockerfile
#	.docker/Dockerfile.rhel
#	.github/history.json
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	HISTORY.md
#	package.json
#	packages/rocketchat-api/server/v1/channels.js
#	packages/rocketchat-lib/rocketchat.info

Loading branch information

rodrigok committed Apr 28, 2018

2 parents 59f88e2 + cbc951c commit 6dc6c18