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

This commit is contained in:
Daniel
2018-05-04 10:22:32 +02:00
parent 3b43bd76fd
commit 3fbd475ed2
20 changed files with 1521 additions and 50 deletions
@@ -8,7 +8,6 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
*
* @usage
* ```typescript
* ionic cordova plugin add cordova-plugin-uptime
* import { Uptime } from '@ionic-native/uptime';
*
* constructor(private uptime: Uptime) { }