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
monkins1010 committed Jul 13, 2023
2 parents a2a41d0 + 563dc0a commit 966635a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 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-4
VERUSCOIN_VERSION: 1.0.12-4
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 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-4",
"version": "1.0.12-5",
"description": "Verus Desktop Wallet App",
"main": "main.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.12-4",
"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/"
Expand Down
2 changes: 1 addition & 1 deletion version_build
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.12-4
1.0.12-5
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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#2ff43b4e9ada824c9c683814e6bea9e42966658f"
resolved "git+https://github.com/VerusCoin/verusbridgekeeper.git#0c313f30a8fdbf92fdbe07363aa48975bf69316a"
dependencies:
axios "0.25.0"
base58check "^2.0.0"
Expand Down

0 comments on commit 966635a

Please sign in to comment.