Merge branch 'release/Release_for_1.0' into develop

Darius Rosendahl · Darius Rosendahl · commit 10740530f2da · 2016-12-20T02:28:45.000+01:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "castlecss-docs",
-  "version": "0.3.1",
+  "version": "1.0.0",
   "description": "Documentation website for CastleCSS",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "castlecss-docs",`
`3`		`- "version": "0.3.1",`
	`3`	`+ "version": "1.0.0",`
`4`	`4`	`"description": "Documentation website for CastleCSS",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`