Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/oplik0/solo2-gui
Browse files Browse the repository at this point in the history
  • Loading branch information
oplik0 committed Dec 26, 2023
2 parents a68a5b7 + 105a6b9 commit 244bea6
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 31 deletions.
4 changes: 2 additions & 2 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
".": "1.0.1",
"src-tauri": "1.0.1"
".": "1.0.2",
"src-tauri": "1.0.2"
}
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [1.0.2](https://github.com/oplik0/solo2-desktop/compare/svelte-v1.0.1...svelte-v1.0.2) (2023-12-26)


### Bug Fixes

* handle multiple keys too ([6337c8c](https://github.com/oplik0/solo2-desktop/commit/6337c8cbc089c131263de16dc17de757415ea073))
* make OATH work if there are no keys yet ([d7b1b07](https://github.com/oplik0/solo2-desktop/commit/d7b1b07f85c61d1d43ae546159c55cbd752647e1))

## [1.0.1](https://github.com/oplik0/solo2-desktop/compare/svelte-v1.0.0...svelte-v1.0.1) (2023-12-25)


Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "solo2-desktop",
"version": "1.0.1",
"version": "1.0.2",
"author": {
"name": "oplik0",
"email": "[email protected]",
Expand Down Expand Up @@ -29,7 +29,7 @@
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"conventional-changelog-conventionalcommits": "^7.0.0",
"dprint": "^0.44.0",
"dprint": "^0.45.0",
"eslint": "^8.51.0",
"eslint-plugin-svelte": "^2.34.0",
"husky": "^8.0.3",
Expand Down
50 changes: 25 additions & 25 deletions pnpm-lock.yaml

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

7 changes: 7 additions & 0 deletions src-tauri/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [1.0.2](https://github.com/oplik0/solo2-desktop/compare/tauri-v1.0.1...tauri-v1.0.2) (2023-12-26)


### Miscellaneous Chores

* **tauri:** Synchronize Tauri app versions

## [1.0.1](https://github.com/oplik0/solo2-desktop/compare/tauri-v1.0.0...tauri-v1.0.1) (2023-12-25)


Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

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

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solo2-desktop"
version = "1.0.1"
version = "1.0.2"
authors = ["oplik0"]
default-run = "solo2-desktop"
edition = "2021"
Expand Down

0 comments on commit 244bea6

Please sign in to comment.