Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/rimraf-6.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
drl990114 committed Aug 20, 2024
2 parents 5562c13 + c764ffd commit 08b06f9
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
26 changes: 13 additions & 13 deletions 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 apps/desktop/UPDATE_LOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# UPDATE LOG

## v0.13.0
## v0.13.1

Features:

Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "markflowy"
version = "0.13.0"
version = "0.13.1"
description = "A Markdown Editor App"
authors = ["drl990114"]
license = " AGPL-3.0"
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"productName": "MarkFlowy",
"version": "0.13.0",
"version": "0.13.1",
"identifier": "com.drl990114.markflowy",
"build": {
"beforeDevCommand": "yarn dev",
Expand Down
4 changes: 2 additions & 2 deletions apps/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ panic = 'abort'

[dependencies]
axum = "0.7.5"
hyper = "1.3.1"
hyper = "1.4.1"
tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread"] }

# GraphQL
Expand Down Expand Up @@ -48,7 +48,7 @@ frunk_core = { version = "0.4.2" }
serde = { version = "1.0", features = ["derive"]}
serde_json = "1.0"
thiserror = "1.0.58"
time = "0.3.34"
time = "0.3.36"
ulid = { version = "1.1.2", features = ["uuid"] }
url = "2.5.2"
uuid = "1.8.0"
Expand Down

0 comments on commit 08b06f9

Please sign in to comment.