Skip to content

Commit

Permalink
Merge branch 'release/v3.2.0' into 'master'
Browse files Browse the repository at this point in the history
release/v3.2.0

See merge request papers/airgap/airgap-vault!146
  • Loading branch information
godenzim committed Apr 24, 2020
2 parents 4d4f4ac + 16d31d5 commit c56b515
Show file tree
Hide file tree
Showing 19 changed files with 400 additions and 200 deletions.
217 changes: 193 additions & 24 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 19 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,33 +50,33 @@
"@ionic/storage": "^2.2.0",
"@ngx-translate/core": "^11.0.1",
"@zxing/ngx-scanner": "1.3.0",
"airgap-coin-lib": "0.7.5",
"airgap-coin-lib": "0.8.0",
"angular2-uuid": "^1.1.1",
"angularx-qrcode": "^1.5.3",
"bignumber.js": "^9.0.0",
"bip39": "^2.4.0",
"com.lampa.startapp": "6.1.6",
"com.lampa.startapp": "^6.1.6",
"cordova-android": "8.1.0",
"cordova-android-support-gradle-release": "3.0.1",
"cordova-android-support-gradle-release": "^3.0.1",
"cordova-clipboard": "1.2.1",
"cordova-ios": "5.0.1",
"cordova-plugin-add-swift-support": "1.7.2",
"cordova-plugin-add-swift-support": "^1.7.2",
"cordova-plugin-airgap-security-utils": "0.4.0",
"cordova-plugin-airgap-webview": "git+https://github.com/airgap-it/cordova-plugin-airgap-webview.git#content-filter",
"cordova-plugin-app-version": "0.1.9",
"cordova-plugin-audioinput": "1.0.1",
"cordova-plugin-camera-preview": "0.11.1",
"cordova-plugin-compat": "1.2.0",
"cordova-plugin-device": "2.0.2",
"cordova-plugin-device-motion": "2.0.1",
"cordova-plugin-gyroscope": "0.1.4",
"cordova-plugin-ionic-keyboard": "2.1.3",
"cordova-plugin-ios-camera-permissions": "1.2.0",
"cordova-plugin-audioinput": "^1.0.1",
"cordova-plugin-camera-preview": "^0.11.1",
"cordova-plugin-compat": "^1.2.0",
"cordova-plugin-device": "^2.0.2",
"cordova-plugin-device-motion": "^2.0.1",
"cordova-plugin-gyroscope": "^0.1.4",
"cordova-plugin-ionic-keyboard": "^2.1.3",
"cordova-plugin-ios-camera-permissions": "^1.2.0",
"cordova-plugin-qrscanner": "3.0.1",
"cordova-plugin-splashscreen": "5.0.2",
"cordova-plugin-statusbar": "2.4.2",
"cordova-plugin-whitelist": "1.3.3",
"cordova-sqlite-storage": "2.6.0",
"cordova-plugin-splashscreen": "^5.0.2",
"cordova-plugin-statusbar": "^2.4.2",
"cordova-plugin-whitelist": "^1.3.3",
"cordova-sqlite-storage": "^2.6.0",
"cordova.plugins.diagnostic": "4.0.10",
"core-js": "^2.5.4",
"ionic-plugin-deeplinks": "git+https://github.com/airgap-it/ionic-plugin-deeplinks.git#cordova-ios-v5.0.0-fix",
Expand Down Expand Up @@ -213,7 +213,9 @@
"cordova-clipboard": {},
"cordova.plugins.diagnostic": {},
"cordova-plugin-app-version": {},
"cordova-plugin-airgap-webview": {},
"cordova-plugin-airgap-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
},
"cordova-plugin-airgap-security-utils": {}
}
}
Expand Down
Loading

0 comments on commit c56b515

Please sign in to comment.