Merge & fix confilcts

This commit is contained in:
Guille
2016-07-17 19:44:19 +02:00
32 changed files with 1598 additions and 199 deletions
+1 -1
View File
@@ -41,7 +41,7 @@ export class CardIO {
/**
* Scan a credit card with card.io.
* @param options
* @param {CardIOOptions} options Options for configuring the plugin
*/
@Cordova()
static scan(options?: CardIOOptions): Promise<any> { return; }