Merge pull request #12264 from RocketChat/develop-sync

Merge master into develop & Set version to 0.71.0-develop
RocketChat · Oct 4, 2018 · 2ebd0f6 · 2ebd0f6
2 parents 64e8e3b + 4189003
commit 2ebd0f6
Show file tree

Hide file tree

Showing 7 changed files with 1,180 additions and 6 deletions.
diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.70.0-develop
+ENV RC_VERSION 0.71.0-develop
 
 MAINTAINER buildmaster@rocket.chat