Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align mainnet with develop #3672

Merged
merged 20 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fb5fd30
Merge pull request #3632 from OriginTrail/v6/release/testnet
Mihajlo-Pavlovic Dec 26, 2024
85f86b9
Merge branch 'v6/release/mainnet' into v6/prerelease/mainnet
Mihajlo-Pavlovic Dec 26, 2024
e8b6d7d
Merge pull request #3633 from OriginTrail/v6/prerelease/mainnet
Mihajlo-Pavlovic Dec 26, 2024
13f29ff
Merge pull request #3639 from OriginTrail/v8/develop
Mihajlo-Pavlovic Dec 27, 2024
4ecf905
Merge pull request #3640 from OriginTrail/v8/release/devnet
Mihajlo-Pavlovic Dec 27, 2024
5f94a2e
Merge pull request #3641 from OriginTrail/v6/prerelease/testnet
Mihajlo-Pavlovic Dec 27, 2024
43e9364
Merge branch 'v6/prerelease/mainnet' into v6/release/testnet
Mihajlo-Pavlovic Dec 27, 2024
cca1a77
Merge pull request #3642 from OriginTrail/v6/release/testnet
Mihajlo-Pavlovic Dec 27, 2024
93a7c12
Merge branch 'v6/release/mainnet' into v6/prerelease/mainnet
Mihajlo-Pavlovic Dec 27, 2024
6494e3d
Merge pull request #3643 from OriginTrail/v6/prerelease/mainnet
Mihajlo-Pavlovic Dec 27, 2024
50f73b4
Merge pull request #3659 from OriginTrail/v8/develop
Mihajlo-Pavlovic Dec 31, 2024
28086a2
Merge branch 'v6/prerelease/testnet' into v8/release/devnet
Mihajlo-Pavlovic Dec 31, 2024
8d6a0df
Merge pull request #3660 from OriginTrail/v8/release/devnet
Mihajlo-Pavlovic Dec 31, 2024
7f912a2
version bump
Mihajlo-Pavlovic Dec 31, 2024
01116b1
Merge branch 'v6/release/testnet' into v6/prerelease/testnet
Mihajlo-Pavlovic Dec 31, 2024
091532c
Merge pull request #3661 from OriginTrail/v6/prerelease/testnet
Mihajlo-Pavlovic Dec 31, 2024
0db8245
Merge branch 'v6/prerelease/mainnet' into v6/release/testnet
Mihajlo-Pavlovic Dec 31, 2024
6a580f8
Merge pull request #3663 from OriginTrail/v6/release/testnet
Mihajlo-Pavlovic Dec 31, 2024
4e7ff2a
Merge branch 'v6/release/mainnet' into v6/prerelease/mainnet
Mihajlo-Pavlovic Dec 31, 2024
daf6bd4
Merge pull request #3664 from OriginTrail/v6/prerelease/mainnet
Mihajlo-Pavlovic Dec 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "origintrail_node",
"version": "8.0.0+hotfix.3",
"version": "8.0.0+hotfix.4",
"description": "OTNode V8",
"main": "index.js",
"type": "module",
Expand Down
Loading