Merge branch 'dev' of github.com:jpush/jmessage-react-plugin into dev

KenChoi · KenChoi · commit cc0d722f3529 · 2018-04-03T14:14:18.000+08:00
diff --git a/document/API.md b/document/API.md
@@ -699,6 +699,7 @@ JMessage.getHistoryMessages({ type: 'single', username: 'username',
 - groupId: 对象群组 id。当 `type` 为 'group' 时，`groupId` 为必填。
 - from: 第一条消息对应的下标，起始为 0。
 - limit: 消息数。当 from = 0 并且 limit = -1 时，返回所有的历史消息。
+- isDescend: 是否降序（消息时间戳从大到小排序），默认为 false。
 
 ### downloadOriginalImage
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jmessage-react-plugin",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "a jmessage plugin for react native application",
   "main": "index.js",
   "repository": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jmessage-react-plugin",`
`3`		`- "version": "2.3.4",`
	`3`	`+ "version": "2.3.5",`
`4`	`4`	`"description": "a jmessage plugin for react native application",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"repository": {`