Merge branch 'master' of github.com:JedWatson/react-select into upstr…

…eam/master # Conflicts: # src/Creatable.js
JedWatson · May 14, 2017 · 0bf710c · 0bf710c
2 parents ec4b4fc + 549d20a
commit 0bf710c
Show file tree

Hide file tree

Showing 38 changed files with 3,282 additions and 1,480 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,13 @@
 # React-Select
 
+## v1.0.0-rc.4 / 2017-05-14
+
+* fixed; no more warning when using React 15.5, thanks [Adam Girton](https://github.com/agirton)
+* fixed; issue comparing objects in `getFocusableOptionIndex`, thanks [rndm2](https://github.com/rndm2)
+* fixed; missing .focus() method in `Creatable`, thanks [Anton Alexandrenok](https://github.com/the-spyke)
+* added; support for `aria-describedby` attribute, thanks [Eric Lee](https://github.com/ericj17)
+* added; `.is-clearable` className when clearable is true, thanks [Dan Diaz](https://github.com/dan-diaz)
+
 ## v1.0.0-rc.3 / 2017-02-01
 
 * added; `arrowRenderer` prop, thanks [Brian Vaughn](https://github.com/bvaughn)

diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
     "dist/react-select.min.js",
     "dist/react-select.min.css"
   ],
-  "version": "1.0.0-beta14",
+  "version": "1.0.0-rc.4",
   "homepage": "https://github.com/JedWatson/react-select",
   "authors": [
     "Jed Watson"

diff --git a/dist/react-select.js b/dist/react-select.js
diff --git a/dist/react-select.min.js b/dist/react-select.min.js