diff --git a/CHANGELOG.md b/CHANGELOG.md index e7b9a6d33..da7bb2321 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ + +# [1.1.0](https://github.com/karma-runner/karma/compare/v1.0.0...v1.1.0) (2016-06-26) + + +### Bug Fixes + +* **deps:** freeze socket.io version ([73e300d](https://github.com/karma-runner/karma/commit/73e300d)) +* **server:** log browser messages to the terminal ([d1f924c](https://github.com/karma-runner/karma/commit/d1f924c)), closes [#2187](https://github.com/karma-runner/karma/issues/2187) + + +### Features + +* Allow frameworks to inject middleware ([d972f3d](https://github.com/karma-runner/karma/commit/d972f3d)) + + + # [1.0.0](https://github.com/karma-runner/karma/compare/v0.13.22...v1.0.0) (2016-06-23) diff --git a/package.json b/package.json index 99abf2433..5afaf5d16 100644 --- a/package.json +++ b/package.json @@ -383,7 +383,7 @@ "engines": { "node": "0.10 || 0.12 || 4 || 5 || 6" }, - "version": "1.0.0", + "version": "1.1.0", "license": "MIT", "scripts": { "lint": "grunt lint",