diff --git a/HISTORY.md b/HISTORY.md index 305bfd1edf..9f7db2314e 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,22 @@ +2.2.5 / 2015-05-14 +================== + + * Merge pull request #1699 from nylen/upgrade/jsdiff + * Upgrade jsdiff to v1.4.0 + * Merge pull request #1648 from nylen/fix/diff-colors + * Merge pull request #1686 from danielstjules/1327-regression + * Sanity check: update fixtures/regression/issue-1327.js to be closer to orig test + * Fix diff colors + * Merge pull request #1675 from danielstjules/integration-tests + * Merge pull request #1682 from kemitchell/spdx-license + * use a valid SPDX license identifier + * Add integration tests + * Merge pull request #1655 from a8m/fix-issue-1241 + * Merge pull request #1661 from a8m/fix-issue-1660 + * fix(utils/stringify): fix issue #1660 + * fix(reporter/base): issue #1241 + 2.2.4 / 2015-04-08 ================== diff --git a/bower.json b/bower.json index dec090f19d..f03b076d09 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "mocha", - "version": "2.2.4", + "version": "2.2.5", "homepage": "http://mocha.github.io/mocha", "description": "simple, flexible, fun test framework", "authors": [ diff --git a/component.json b/component.json index a280cb60cc..5da3daa25e 100644 --- a/component.json +++ b/component.json @@ -1,6 +1,6 @@ { "name": "mocha", - "version": "2.2.4", + "version": "2.2.5", "repo": "mochajs/mocha", "description": "simple, flexible, fun test framework", "keywords": [ diff --git a/package.json b/package.json index 552e3f1aa2..28e16ffd42 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mocha", - "version": "2.2.4", + "version": "2.2.5", "description": "simple, flexible, fun test framework", "keywords": [ "mocha",