Merge branch 'master' into dev

This commit is contained in:
Hevin 2016-05-18 14:19:12 +08:00
commit e898c7933c

View File

@ -26,6 +26,9 @@
"version": ">=3.0"
}
],
"peerDependencies": {
"cordova-plugin-device": ">=1.0.0"
},
"author": "jpush",
"license": "Apache 2.0 License",
"bugs": {