Merge remote-tracking branch 'origin/master'

rofrischmann · rofrischmann · commit efef050fbffb · 2016-12-19T19:55:43.000+01:00
# Conflicts:
#	package.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "css-functions",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "JavaScript functions to build CSS functions",
   "main": "lib/index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "css-functions",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"description": "JavaScript functions to build CSS functions",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"scripts": {`