Merge branch 'dev'

jpush · May 2, 2017 · 54f0991 · 54f0991
2 parents a008609 + 564c684
commit 54f0991
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # JMessage PhoneGap / Cordova Plugin
 
-[![release](https://img.shields.io/badge/release-2.3.5-blue.svg)](https://github.com/jpush/jmessage-phonegap-plugin/releases)
+[![release](https://img.shields.io/badge/release-2.3.6-blue.svg)](https://github.com/jpush/jmessage-phonegap-plugin/releases)
 [![platforms](https://img.shields.io/badge/platforms-iOS%7CAndroid-lightgrey.svg)](https://github.com/jpush/jmessage-phonegap-plugin)
 [![QQ Group](https://img.shields.io/badge/QQ%20Group-413602425-red.svg)](https://github.com/jpush/jmessage-phonegap-plugin)
 [![weibo](https://img.shields.io/badge/weibo-JPush-blue.svg)](http://weibo.com/jpush?refer_flag=1001030101_&is_all=1)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "jmessage-phonegap-plugin",
- "version": "2.3.5",
+ "version": "2.3.6",
  "description": "JMessage Cordova Plugin.",
  "cordova": {
  "id": "jmessage-phonegap-plugin",
@@ -36,4 +36,4 @@
  "url": "https://github.com/jpush/jmessage-phonegap-plugin/issues"
  },
  "homepage": "https://github.com/jpush/jmessage-phonegap-plugin#readme"
-}
+}
diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
  xmlns:android="http://schemas.android.com/apk/res/android"
  id="jmessage-phonegap-plugin"
- version="2.3.5">
+ version="2.3.6">
 
  <name>JMessage</name>
  <description>集成极光 IM 和推送功能</description>