Merge branch 'develop' into livechat-guest-pool-based-on-department

RocketChat · Sep 5, 2018 · deb2548 · deb2548
2 parents 8dba1b5 + 15a01ee
commit deb2548
Show file tree

Hide file tree

Showing 49 changed files with 4,581 additions and 2,928 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.69.0-develop
+ENV RC_VERSION 0.70.0-develop
 
 MAINTAINER buildmaster@rocket.chat