Merge master into develop & Set version to 3.12.0-develop #20533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

sampaiodiego merged 18 commits into develop from develop-sync

Feb 1, 2021

.docker/Dockerfile.rhel

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     FROM registry.access.redhat.com/ubi8/nodejs-12
-    ENV RC_VERSION 3.11.0-develop
+    ENV RC_VERSION 3.12.0-develop
     MAINTAINER [email protected]
@@ Expand Down @@

.github/history.json

Large diffs are not rendered by default.

.snapcraft/resources/prepareRocketChat

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     #!/bin/bash
-    curl -SLf "https://releases.rocket.chat/3.11.0-develop/download/" -o rocket.chat.tgz
+    curl -SLf "https://releases.rocket.chat/3.12.0-develop/download/" -o rocket.chat.tgz
     tar xf rocket.chat.tgz --strip 1
@@ Expand Down @@

.snapcraft/snap/snapcraft.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     # 5.  `snapcraft snap`
     name: rocketchat-server
-    version: 3.11.0-develop
+    version: 3.12.0-develop
     summary: Rocket.Chat server
     description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
     confinement: strict
@@ Expand Down @@

HISTORY.md

Large diffs are not rendered by default.

app/utils/rocketchat.info

-Original file line number
+Diff line change
@@ -1,3 +1,3 @@
     {
-    	"version": "3.11.0-develop"
+    	"version": "3.12.0-develop"
     }

package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

package.json

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     {
     	"name": "Rocket.Chat",
     	"description": "The Ultimate Open Source WebChat Platform",
-    	"version": "3.11.0-develop",
+    	"version": "3.12.0-develop",
     	"author": {
     		"name": "Rocket.Chat",
     		"url": "https://rocket.chat/"
@@ Expand Down @@

Provide feedback