Merge branch '0.8'

danez · danez · commit e5fab6b3ec97 · 2017-04-20T10:20:52.000+02:00
# Conflicts:
#	bower.json
#	dist/react-tabs.js
#	dist/react-tabs.js.map
#	dist/react-tabs.min.js
#	dist/react-tabs.min.js.map
#	package.json
#	src/components/Tab.js
#	src/components/TabList.js
#	src/components/TabPanel.js
#	src/components/Tabs.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+### 0.8.3 (Apr 19, 2017)
+
+- Fix deprecation warnings with react 15.5
+
+### 0.8.2 (Oct 19, 2016)
+
+- Fix UMD build (#143)
+
 ### 0.8.0 (Sep 14, 2016)
 
 - Allow other components inside TabList (#123)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-tabs",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "description": "React tabs component",
   "main": "lib/index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-tabs",`
`3`		`- "version": "0.8.2",`
	`3`	`+ "version": "0.8.3",`
`4`	`4`	`"description": "React tabs component",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"scripts": {`