Merge branch 'master' into release

blagoev · blagoev · commit 53f283f23684 · 2015-07-20T13:47:28.000+03:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tns-android",
   "description": "NativeScript Runtime for Android",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "files": [
     "**/*.*"
   ],

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tns-android",`
`3`	`3`	`"description": "NativeScript Runtime for Android",`
`4`		`- "version": "1.1.0",`
	`4`	`+ "version": "1.2.0",`
`5`	`5`	`"files": [`
`6`	`6`	`"*/.*"`
`7`	`7`	`],`