Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Ronny committed May 27, 2021
2 parents 06ee4b6 + d6ad53c commit cf13bb3
Show file tree
Hide file tree
Showing 3 changed files with 165 additions and 20 deletions.
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="alastria.wallet" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="alastria.wallet" version="0.1.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Alastria Wallet</name>
<description>Alastria Wallet</description>
<author email="communication@alastria.io​" href="http://alastria.io/">Alastria</author>
Expand Down
179 changes: 162 additions & 17 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alastria-wallet-4b",
"version": "0.0.1",
"version": "0.1.1",
"author": "Alastria",
"homepage": "https://alastria.io/",
"description": "Alastria Wallet app",
Expand Down Expand Up @@ -33,7 +33,7 @@
"@ionic-native/splash-screen": "^5.24.0",
"@ionic-native/status-bar": "^5.24.0",
"@ionic/angular": "^5.2.1",
"alastria-identity-lib": "github:alastria/alastria-identity-lib#develop",
"alastria-identity-lib": "github:alastria/alastria-identity-lib#1.6",
"cordova-android": "8.1.0",
"cordova-browser": "6.0.0",
"cordova-ios": "5.0.0",
Expand Down

0 comments on commit cf13bb3

Please # to comment.