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
@@ -1,10 +1,5 @@
import { Injectable } from '@angular/core';
import {
Cordova,
Plugin,
IonicNativePlugin,
CordovaCheck
} from '@ionic-native/core';
import { Cordova, CordovaCheck, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs';
declare var chcp: any;