Skip to content

Commit

Permalink
Merge branch 'main' into pavolum/removeTemplateVersion
Browse files Browse the repository at this point in the history
  • Loading branch information
cwhitten committed Dec 9, 2020
2 parents bdeef0c + 09467d2 commit 75d61f8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Composer/packages/client/config/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function getClientEnvironment(publicUrl) {
PUBLIC_URL: publicUrl,
GIT_SHA: getGitSha().toString().replace('\n', ''),
SDK_PACKAGE_VERSION: '4.11.0', // TODO: change this when Composer supports custom schema/custom runtime
COMPOSER_VERSION: '1.3.0-rc1',
COMPOSER_VERSION: '1.3.0-rc2',
LOCAL_PUBLISH_PATH:
process.env.LOCAL_PUBLISH_PATH || path.resolve(process.cwd(), '../../../extensions/localPublish/hostedBots'),
}
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/electron-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@bfc/electron-server",
"license": "MIT",
"author": "Microsoft Corporation",
"version": "1.3.0-rc1",
"version": "1.3.0-rc2",
"description": "Electron wrapper around Composer that launches Composer as a desktop application.",
"main": "./build/main.js",
"engines": {
Expand Down

0 comments on commit 75d61f8

Please sign in to comment.