Skip to content

Commit

Permalink
Merge a8904ef into c520cc6
Browse files Browse the repository at this point in the history
  • Loading branch information
tonyanziano committed Apr 13, 2021
2 parents c520cc6 + a8904ef commit 8ad3fc7
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 75 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
## Added
- [client] Bumped `botframework-webchat` to v4.13.0 in PR [2258](https://github.com/microsoft/BotFramework-Emulator/pull/2258)

## Fixed
- [client] Added circular JSON handling to `forwardToMain.ts` which fixed a bug preventing the Emulator from connecting to Direct Line Speech bots in PR [2242](https://github.com/microsoft/BotFramework-Emulator/pull/2242)
- [client/main] Fixed an issue where the Emulator was failing to detect the final redirect URL when trying to login to Azure in PR [2248](https://github.com/microsoft/BotFramework-Emulator/pull/2248)
Expand Down
147 changes: 74 additions & 73 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions packages/app/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@
"base64url": "3.0.0",
"botframework-config": "4.4.0",
"botframework-schema": "^4.3.4",
"botframework-webchat": "4.12.0",
"botframework-webchat-core": "4.12.0",
"botframework-webchat": "4.13.0",
"botframework-webchat-core": "4.13.0",
"core-js": "^3.6.5",
"eslint-plugin-react": "^7.12.3",
"markdown-it": "^8.4.2",
Expand Down

0 comments on commit 8ad3fc7

Please sign in to comment.