Merge branch 'develop' into settings-permissions-roles-updates

RocketChat · May 4, 2020 · 6634755 · 6634755
2 parents a9e1bc7 + c05eac5
commit 6634755
Show file tree

Hide file tree

Showing 470 changed files with 11,305 additions and 3,630 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.2.0-develop
+ENV RC_VERSION 3.3.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/.eslintignore b/.eslintignore
@@ -8,7 +8,6 @@ app/katex/client/katex/katex.min.js
 packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
 packages/rocketchat-livechat/assets/rocket-livechat.js
 app/theme/client/vendor/
-app/ui/client/lib/customEventPolyfill.js
 app/ui/client/lib/Modernizr.js
 public/mp3-realtime-worker.js
 public/lame.min.js