Merge branch 'master' into next

taion · taion · commit 26ea1aac2fad · 2016-05-19T18:41:34.000-04:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,12 @@
+## [v2.4.1]
+> May 19, 2016
+
+- **Bugfix:** Don't crash on invalid URI components in params ([#3453])
+
+[v2.4.1]: https://github.com/reactjs/react-router/compare/v2.4.0...v2.4.1
+[#3453]: https://github.com/reactjs/react-router/pull/3453
+
+
 ## [v2.4.0]
 > April 28, 2016
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "A complete routing library for React",
   "files": [
     "*.md",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-router",`
`3`		`- "version": "2.4.0",`
	`3`	`+ "version": "2.4.1",`
`4`	`4`	`"description": "A complete routing library for React",`
`5`	`5`	`"files": [`
`6`	`6`	`"*.md",`