Merge branch 'master' into v5

This commit is contained in:
Daniel
2018-06-22 18:13:47 +02:00
parent f7afd1f066
commit f3ef2a877d
31 changed files with 815 additions and 117 deletions
@@ -1,6 +1,8 @@
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs';
import { Injectable } from '@angular/core';
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs/Observable';
/**
* @name Appodeal