Merge pull request #18752 from RocketChat/develop-sync

Merge master into develop & Set version to 3.7.0-develop
RocketChat · Aug 31, 2020 · 65f4cd1 · 65f4cd1
2 parents a5118fa + 9efa419
commit 65f4cd1
Show file tree

Hide file tree

Showing 8 changed files with 5,540 additions and 3,888 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 3.6.0-develop
+ENV RC_VERSION 3.7.0-develop
 
 MAINTAINER buildmaster@rocket.chat