Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
yasharAyari committed Jan 21, 2020
2 parents 6c872a4 + 94aab62 commit a6a8949
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/package.json
@@ -1,6 +1,6 @@
{
"name": "lisk-desktop",
"version": "1.24.0-rc.1",
"version": "1.24.0",
"description": "Lisk",
"main": "./build/main.js",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion 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
@@ -1,6 +1,6 @@
{
"name": "Lisk",
"version": "1.24.0-rc.1",
"version": "1.24.0",
"description": "Lisk",
"homepage": "https://github.com/LiskHQ/lisk-desktop",
"bugs": "https://github.com/LiskHQ/lisk-desktop/issues",
Expand Down

0 comments on commit a6a8949

Please sign in to comment.