Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/lib/constants/cryptos/data.json
  • Loading branch information
bludnic committed Feb 2, 2024
2 parents 3b358ee + 387036d commit 2d9af2e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
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": "adamant-im",
"version": "4.5.2",
"version": "4.5.3",
"author": "ADAMANT Foundation <devs@adamant.im>",
"license": "GPLv3",
"description": "Decentralized Messenger",
Expand Down

0 comments on commit 2d9af2e

Please sign in to comment.