Merge branch 'master' into testnet

# Conflicts: # cordova/config.xml # package.json # webkitbuilds/setup-win32.iss # webkitbuilds/setup-win64.iss
byteball · Sep 22, 2018 · a7e9e03 · a7e9e03
2 parents 5e2ac89 + c7e6650
commit a7e9e03
Show file tree

Hide file tree

Showing 31 changed files with 457 additions and 196 deletions.
diff --git a/cordova/config.xml b/cordova/config.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="org.byteball.wallet.testnet"
-  version="2.5.0"
-  android-versionCode="1072"
-  ios-CFBundleVersion="2.5.0" xmlns:android="http://schemas.android.com/apk/res/android">
+  version="2.6.0"
+  android-versionCode="1073"
+  ios-CFBundleVersion="2.6.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Byteball TN</name>
     <description>
       Byteball wallet for testnet.