Merge remote-tracking branch 'origin/master' into gulp

aisk · aisk · commit bb4dc8708f63 · 2015-01-28T19:48:19.000+08:00
Conflicts:
	package.json
diff --git a/lib/av.js b/lib/av.js
@@ -1,10 +1,10 @@
 /*!
  * AVOSCloud JavaScript SDK
- * Version: 0.4.6
+ * Version: 0.4.7
  * Built: Mon Jun 03 2013 13:45:00
- * http://avoscloud.com
+ * https://leancloud.cn
  *
- * Copyright 2013 AV, Inc.
+ * Copyright 2015 LeanCloud.cn, Inc.
  * The AVOS Cloud JavaScript SDK is freely distributable under the MIT license.
  *
  * Includes: Underscore.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "avoscloud-sdk",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "main": "./lib/av.js",
   "description": "AVOSCloud JavaScript SDK.",
   "repository": {

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`/*!`
`2`	`2`	`* AVOSCloud JavaScript SDK`
`3`		`- * Version: 0.4.6`
	`3`	`+ * Version: 0.4.7`
`4`	`4`	`* Built: Mon Jun 03 2013 13:45:00`
`5`		`- * http://avoscloud.com`
	`5`	`+ * https://leancloud.cn`
`6`	`6`	`*`
`7`		`- * Copyright 2013 AV, Inc.`
	`7`	`+ * Copyright 2015 LeanCloud.cn, Inc.`
`8`	`8`	`* The AVOS Cloud JavaScript SDK is freely distributable under the MIT license.`
`9`	`9`	`*`
`10`	`10`	`* Includes: Underscore.js`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "avoscloud-sdk",`
`3`		`- "version": "0.4.6",`
	`3`	`+ "version": "0.4.7",`
`4`	`4`	`"main": "./lib/av.js",`
`5`	`5`	`"description": "AVOSCloud JavaScript SDK.",`
`6`	`6`	`"repository": {`