Merge branch 'master' into dev

MCStreetguy · MCStreetguy · commit 7b06acbdb55e · 2017-07-29T13:18:42.000+02:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "snippet-injector",
   "main": "./lib/snippet-injector",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "An easy but powerful snippet management tool for Atom editor.",
   "keywords": [],
   "repository": "https://github.com/MCStreetguy/atom-snippet-injector",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "snippet-injector",`
`3`	`3`	`"main": "./lib/snippet-injector",`
`4`		`- "version": "1.2.4",`
	`4`	`+ "version": "1.2.5",`
`5`	`5`	`"description": "An easy but powerful snippet management tool for Atom editor.",`
`6`	`6`	`"keywords": [],`
`7`	`7`	`"repository": "https://github.com/MCStreetguy/atom-snippet-injector",`