Skip to content

Commit

Permalink
Merge branch 'admin-refactor' of https://github.com/RocketChat/Rocket…
Browse files Browse the repository at this point in the history
….Chat into custom-emoji

* 'admin-refactor' of https://github.com/RocketChat/Rocket.Chat:
  LingoHub based on develop (#17520)
  RegExp improvements suggested by LGTM (#17500)
  [FIX] Replace obsolete X-FRAME-OPTIONS header on Livechat route (#17419)
  [FIX] LDAP login error on Enterprise version (#17497)
  [IMPROVE] [Apps-Engine] App user as the default notifier (#17050)
  [NEW] [Apps-Engine] New Livechat event handlers (#17033)
  [FIX] Change email verification label (#17450)
  fix: Admin Users Actions (#17469)
  Fix bad component reference
  [IMPROVE] Depart from /app/ui-admin (#17464)
  Priority system messages were always created (#17479)
  Bump version to 3.3.0-develop
  Bump version to 3.2.0
  Bump version to 3.2.0-rc.2
  Bump version to 3.2.0-rc.1
  Bump version to 3.2.0-rc.0
  • Loading branch information
dudizilla committed May 4, 2020
2 parents 457fd3f + 72b98c2 commit 20ebb2b
Show file tree
Hide file tree
Showing 284 changed files with 3,211 additions and 2,321 deletions.
2 changes: 1 addition & 1 deletion .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -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 [email protected]

Expand Down
Loading

0 comments on commit 20ebb2b

Please sign in to comment.