Merge remote-tracking branch 'origin/develop' into fix-x-frame-header

# Conflicts: # server/startup/migrations/index.js # server/startup/migrations/v162.js
RocketChat · Oct 18, 2019 · 12f243e · 12f243e
2 parents 6778e7a + 28e290c
commit 12f243e
Show file tree

Hide file tree

Showing 262 changed files with 26,978 additions and 14,232 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 2.1.0-develop
+ENV RC_VERSION 2.2.0-develop
 
 MAINTAINER buildmaster@rocket.chat