Skip to content

Commit

Permalink
Merge branch 'testnet' of https://github.com/VerusCoin/Verus-Desktop
Browse files Browse the repository at this point in the history
…into testnet
  • Loading branch information
michaeltout committed Jul 13, 2023
2 parents 90fb669 + 563dc0a commit a1a432b
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ stages:
variables:
DOCKER_DRIVER: overlay2
DEFAULT_VERUSCOIN_BRANCH: release
VERUS_VERSION: 1.0.12-2
VERUSCOIN_VERSION: 1.0.12-2
VERUS_VERSION: 1.0.12-5
VERUSCOIN_VERSION: 1.0.12-5
KOMODO_VERSION: 0.8.0
KOMODO_DOWNLOAD_URL: https://github.com/KomodoPlatform/komodo/releases/download
PIRATE_VERSION: 5.7.4
Expand Down
2 changes: 1 addition & 1 deletion gui/Verus-Desktop-GUI
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "verus-desktop-testnet",
"productName": "Verus-Desktop-Testnet",
"version": "1.0.12-2",
"version": "1.0.12-5",
"description": "Verus Desktop Wallet App",
"main": "main.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "1.0.12-2",
"minVersion": "1.0.12-2",
"version": "1.0.12-5",
"minVersion": "1.0.12-4",
"versionUrl": "https://raw.githubusercontent.com/VerusCoin/Verus-Desktop/master/version.json",
"repository": "https://github.com/VerusCoin/Verus-Desktop/"
}
2 changes: 1 addition & 1 deletion version_build
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.12-2
1.0.12-5
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7439,7 +7439,7 @@ verror@^1.10.0:

"verus-typescript-primitives@git+https://github.com/VerusCoin/verus-typescript-primitives.git":
version "1.0.0"
resolved "git+https://github.com/VerusCoin/verus-typescript-primitives.git#8eeb27571b7d695a1a53e1062d424744599e6ec8"
resolved "git+https://github.com/VerusCoin/verus-typescript-primitives.git#c76a26e2ffedb2dc27fb6deeef3f8942e8a65244"
dependencies:
base64url "3.0.1"
bn.js "5.2.1"
Expand All @@ -7452,7 +7452,7 @@ verror@^1.10.0:

"verus_bridgekeeper@git+https://github.com/VerusCoin/verusbridgekeeper.git":
version "1.0.6"
resolved "git+https://github.com/VerusCoin/verusbridgekeeper.git#0c2876304b82d04c746283f909930673ba651d6b"
resolved "git+https://github.com/VerusCoin/verusbridgekeeper.git#0c313f30a8fdbf92fdbe07363aa48975bf69316a"
dependencies:
axios "0.25.0"
base58check "^2.0.0"
Expand Down

0 comments on commit a1a432b

Please sign in to comment.