Merge branch 'master' into gh-pages

pughpugh · pughpugh · commit 038caf392a40 · 2015-12-22T10:05:28.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.5 - Dec 22, 2015
+
+  * Removed React into peerDependencies
+
 ## 1.0.5 - Dec 21, 2015
 
   * Removed ReactDOM dependency
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 A HTML 5 canvas countdown clock as a React component
 
+![Screenshot](http://pughpugh.github.io/react-countdown-clock/screenshot.png?=0)
+
 ## Demo
 
 [pughpugh.github.io/react-countdown-clock](http://pughpugh.github.io/react-countdown-clock)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-countdown-clock",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "HTML5 canvas countdown clock React component",
   "main": "build/react-countdown-clock.js",
   "repository": {
@@ -26,7 +26,7 @@
     "coffee-script": "^1.8.0",
     "webpack": "^1.4.15"
   },
-  "dependencies": {
+  "peerDependencies": {
     "react": "^0.14.3"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-countdown-clock",`
`3`		`- "version": "1.0.5",`
	`3`	`+ "version": "1.0.6",`
`4`	`4`	`"description": "HTML5 canvas countdown clock React component",`
`5`	`5`	`"main": "build/react-countdown-clock.js",`
`6`	`6`	`"repository": {`
`@@ -26,7 +26,7 @@`
`26`	`26`	`"coffee-script": "^1.8.0",`
`27`	`27`	`"webpack": "^1.4.15"`
`28`	`28`	`},`
`29`		`- "dependencies": {`
	`29`	`+ "peerDependencies": {`
`30`	`30`	`"react": "^0.14.3"`
`31`	`31`	`}`
`32`	`32`	`}`