From e8f3f0933cff906d17863a714e2428721d7c1906 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 24 Aug 2020 18:46:47 -0300
Subject: [PATCH] Bump version to 3.5.4

---
 .docker/Dockerfile.rhel                |  2 +-
 .github/history.json                   | 22 ++++++++++++++++++++++
 .snapcraft/resources/prepareRocketChat |  2 +-
 .snapcraft/snap/snapcraft.yaml         |  2 +-
 HISTORY.md                             | 18 ++++++++++++++++++
 app/utils/rocketchat.info              |  2 +-
 package-lock.json                      |  2 +-
 package.json                           |  2 +-
 8 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 7b7708573df..c89b898b0e7 100644
--- 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.5.3
+ENV RC_VERSION 3.5.4
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 1df38d5da60..5568f7e361b 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -48074,6 +48074,28 @@
           ]
         }
       ]
+    },
+    "3.5.4": {
+      "node_version": "12.16.1",
+      "npm_version": "6.14.0",
+      "apps_engine_version": "1.16.0",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "18621",
+          "title": "[FIX] MarkdownText usage",
+          "userLogin": "ggazzo",
+          "milestone": "3.5.4",
+          "contributors": [
+            "ggazzo",
+            "web-flow"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat
index db3c6c74366..8e20d8eefec 100755
--- a/.snapcraft/resources/prepareRocketChat
+++ b/.snapcraft/resources/prepareRocketChat
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/3.5.3/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/3.5.4/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 
diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml
index a0c5357a907..f8051819ea8 100644
--- a/.snapcraft/snap/snapcraft.yaml
+++ b/.snapcraft/snap/snapcraft.yaml
@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 3.5.3
+version: 3.5.4
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict
diff --git a/HISTORY.md b/HISTORY.md
index c47b3ec8580..cad79c4485c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,22 @@
 
+# 3.5.4
+`2020-08-24  ·  1 🐛  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.16.1`
+- NPM: `6.14.0`
+- MongoDB: `3.4, 3.6, 4.0`
+- Apps-Engine: `1.16.0`
+
+### 🐛 Bug fixes
+
+
+- MarkdownText usage ([#18621](https://github.com/RocketChat/Rocket.Chat/pull/18621))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+
 # 3.5.3
 `2020-08-19  ·  3 🐛  ·  2 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index c3ea3db3385..c20a30da336 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.5.3"
+	"version": "3.5.4"
 }
diff --git a/package-lock.json b/package-lock.json
index 8d1935a1ac3..8a66c2f0b67 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "Rocket.Chat",
-	"version": "3.5.3",
+	"version": "3.5.4",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/package.json b/package.json
index c0535832841..2c206d42936 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.5.3",
+	"version": "3.5.4",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"