Merge branch 'master' into 10-show-bikes-from-api-response-on-map
# Conflicts: # src/app/home/home.page.ts
... | ... | @@ -24,8 +24,10 @@ |
"@ionic-native/splash-screen": "^5.0.0", | ||
"@ionic-native/status-bar": "^5.0.0", | ||
"@ionic/angular": "^4.7.1", | ||
"@ionic/storage": "^2.2.0", | ||
"cordova-android": "8.1.0", | ||
"cordova-plugin-geolocation": "^4.0.2", | ||
"cordova-sqlite-storage": "^3.4.0", | ||
"core-js": "^2.5.4", | ||
"rxjs": "~6.5.1", | ||
"tslib": "^1.9.0", | ||
... | ... | @@ -74,10 +76,11 @@ |
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" | ||
}, | ||
"cordova-plugin-ionic-keyboard": {}, | ||
"cordova-plugin-geolocation": {} | ||
"cordova-plugin-geolocation": {}, | ||
"cordova-sqlite-storage": {} | ||
}, | ||
"platforms": [ | ||
"android" | ||
] | ||
} | ||
} | ||
\ No newline at end of file | ||
} |
Please register or sign in to comment