From 580de2dbe7c00da5ddbae569261c31334b024c85 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Wed, 21 Feb 2018 00:48:40 -0300 Subject: [PATCH] Develop fix sync from master --- .docker/Dockerfile | 2 +- .sandstorm/sandstorm-pkgdef.capnp | 2 +- .travis/snap.sh | 2 +- package.json | 2 +- packages/rocketchat-lib/rocketchat.info | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index b845c74c74a0..e7bb1da9be98 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,6 +1,6 @@ FROM rocketchat/base:8 -ENV RC_VERSION 0.61.2 +ENV RC_VERSION 0.62.0-develop MAINTAINER buildmaster@rocket.chat diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index e5edaee3498a..b720f3c27ddb 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = ( appVersion = 62, # Increment this for every release. - appMarketingVersion = (defaultText = "0.61.2"), + appMarketingVersion = (defaultText = "0.62.0-develop"), # Human-readable representation of appVersion. Should match the way you # identify versions of your app in documentation and marketing. diff --git a/.travis/snap.sh b/.travis/snap.sh index 157b8d19769a..38e016c2fae9 100755 --- a/.travis/snap.sh +++ b/.travis/snap.sh @@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then RC_VERSION=$TRAVIS_TAG else CHANNEL=edge - RC_VERSION=0.61.2 + RC_VERSION=0.62.0-develop fi echo "Preparing to trigger a snap release for $CHANNEL channel" diff --git a/package.json b/package.json index 3b2f481cb956..d8d6bfa0958d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "0.61.2", + "version": "0.62.0-develop", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/" diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info index 0599a6e3b200..46273c8211eb 100644 --- a/packages/rocketchat-lib/rocketchat.info +++ b/packages/rocketchat-lib/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "0.61.2" + "version": "0.62.0-develop" }