Merge branch 'master' into v5

This commit is contained in:
Daniel
2018-09-17 18:23:18 +02:00
parent 46b1a7385c
commit 039c6d40af
76 changed files with 846 additions and 494 deletions
+2 -2
View File
@@ -6,7 +6,7 @@ import {
IonicNativePlugin,
Plugin
} from '@ionic-native/core';
import { merge, Observable } from 'rxjs';
import { Observable, merge } from 'rxjs';
declare const navigator: any;
@@ -36,7 +36,7 @@ declare const navigator: any;
* let connectSubscription = this.network.onConnect().subscribe(() => {
* console.log('network connected!');
* // We just got a connection but we need to wait briefly
* // before we determine the connection type. Might need to wait.
* // before we determine the connection type. Might need to wait.
* // prior to doing any api requests as well.
* setTimeout(() => {
* if (this.network.type === 'wifi') {