diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ec8891ed..1bf6a06a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ + +## [1.1.2](https://github.com/karma-runner/karma/compare/v1.1.1...v1.1.2) (2016-07-26) + + +### Bug Fixes + +* Merge config child nodes on config.set() ([65b688a](https://github.com/karma-runner/karma/commit/65b688a)) +* **context:** Updated postMessage listener to stop validating non-Karma messages ([306e565](https://github.com/karma-runner/karma/commit/306e565)) +* **docs:** fix stopper.stop wrong variable name. closes [#2244](https://github.com/karma-runner/karma/issues/2244) ([0745a00](https://github.com/karma-runner/karma/commit/0745a00)), closes [#2244](https://github.com/karma-runner/karma/issues/2244) +* **file-list:** ensure patterns are comparable ([4d1bf3e](https://github.com/karma-runner/karma/commit/4d1bf3e)), closes [#2194](https://github.com/karma-runner/karma/issues/2194) +* **middleware:** fix WARN log when passing undefined error handler to promise.then ([20b87de](https://github.com/karma-runner/karma/commit/20b87de)), closes [#2227](https://github.com/karma-runner/karma/issues/2227) + + + ## [1.1.1](https://github.com/karma-runner/karma/compare/v1.1.0...v1.1.1) (2016-07-07) diff --git a/package.json b/package.json index 203964731..73df6635f 100644 --- a/package.json +++ b/package.json @@ -390,7 +390,7 @@ "engines": { "node": "0.10 || 0.12 || 4 || 5 || 6" }, - "version": "1.1.1", + "version": "1.1.2", "license": "MIT", "scripts": { "lint": "grunt lint",