Merge branch 'master' into next

z-ZYS-s · z-ZYS-s · commit d355ed0bab95 · 2017-10-27T17:52:13.000+08:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "icon-font-loader",
   "description": "Transform icon-font CSS property and generate font files automatically",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "author": "moujintao <moujintaotest@163.com>",
   "contributors": [
     "Rainfore <rainforest92@126.com>"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "icon-font-loader",`
`3`	`3`	`"description": "Transform icon-font CSS property and generate font files automatically",`
`4`		`- "version": "0.2.5",`
	`4`	`+ "version": "0.3.0",`
`5`	`5`	`"author": "moujintao <moujintaotest@163.com>",`
`6`	`6`	`"contributors": [`
`7`	`7`	`"Rainfore <rainforest92@126.com>"`