Merge remote-tracking branch 'upstream/master' into depend-mocha

hmeerlo · Jun 9, 2016 · f29c918 · f29c918
2 parents ce2b262 + acac7e6
commit f29c918
Show file tree

Hide file tree

Showing 48 changed files with 550 additions and 220 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,21 @@
 # Changelog
 
+## 2.2.0 (8 June 2016)
+
+- `disableAlpha` on Chrome and Sketch pickers
+
+## 2.1.1 (8 June 2016)
+
+- Fix ChromeFields icon highlight
+- Make Deps compatible with 0.14 and 15
+- Fix React 15 warnings and Hex Hash Problems
+
 ## 2.1.0 (6 March 2016)
 
 - Update Dependencies for React 15
 - Fix Tests to Not Rely on Internal Instance
 - Fix `e.pageX` from short circuiting
-- Remove all z-index 
+- Remove all z-index
 
 ## 2.0.0 (6 March 2016)