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
@@ -101,4 +101,5 @@ export class AES256 extends IonicNativePlugin {
generateSecureIV(password: string): Promise<string> {
return;
}
}