Merge remote-tracking branch 'origin/wallet/dev' into wallet/dev

This commit is contained in:
Sebastiaan Pasma 2018-08-13 14:13:55 +02:00
commit d2a1461a26
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F

View file

@ -24,9 +24,9 @@
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
"pushSenderId": "1036948132229",
"description": "A Secure Bitcoin Wallet",
"version": "4.13.2",
"fullVersion": "4.13-rc3",
"androidVersion": "413200",
"version": "5.0.0",
"fullVersion": "5.0-rc1",
"androidVersion": "500000",
"_extraCSS": "",
"_enabledExtensions": {
"coinbase": false,