Merge pull request #18083 from RocketChat/develop-sync

Merge master into develop & Set version to 3.5.0-develop
RocketChat · Jun 30, 2020 · 986d2a7 · 986d2a7
2 parents 1157075 + 0ba0bd0
commit 986d2a7
Show file tree

Hide file tree

Showing 8 changed files with 2,349 additions and 89 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.4.0-develop
+ENV RC_VERSION 3.5.0-develop
 
 MAINTAINER buildmaster@rocket.chat