Merge pull request #15097 from RocketChat/develop-sync

Merge master into develop & Set version to 1.4.0-develop
RocketChat · Aug 2, 2019 · 491295f · 491295f
2 parents 96d6ff9 + ab70e04
commit 491295f
Show file tree

Hide file tree

Showing 6 changed files with 1,151 additions and 4 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 1.3.0-develop
+ENV RC_VERSION 1.4.0-develop
 
 MAINTAINER buildmaster@rocket.chat