Merge branch 'develop' into apps/features-for-may

RocketChat · May 20, 2018 · 5eb1a4b · 5eb1a4b
2 parents fafc6da + 1070edf
commit 5eb1a4b
Show file tree

Hide file tree

Showing 125 changed files with 4,005 additions and 1,048 deletions.
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.64.0-develop
+ENV RC_VERSION 0.65.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

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.64.0-develop
+ENV RC_VERSION 0.65.0-develop
 
 MAINTAINER buildmaster@rocket.chat