Skip to content

Commit

Permalink
Merge branch 'main' into feat/structured-logging
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderStorm authored Sep 18, 2023
2 parents 4e77d4e + e556bee commit 32bcfde
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions server/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 server/calendar/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ actix-web-prom.workspace = true
serde.workspace = true
serde_json.workspace = true

chrono = { version = "0.4.30", default-features = false, features = ["serde"] }
chrono = { version = "0.4.31", default-features = false, features = ["serde"] }

# database
diesel = { version = "2.1.1", features = ["default", "chrono", "postgres"] }
Expand Down
2 changes: 1 addition & 1 deletion server/feedback/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ octocrab = "0.30.1"

# web
jsonwebtoken = "8.3.0"
chrono= { version = "0.4.30", default-features = false }
chrono= { version = "0.4.31", default-features = false }
actix-governor = { version = "0.4.1", features = ["log"] }

# proposing feedback
Expand Down
20 changes: 10 additions & 10 deletions webclient/package-lock.json

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

4 changes: 2 additions & 2 deletions webclient/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"maplibre-gl": "3.3.1",
"pinia": "2.1.6",
"spectre.css": "github:Valexr/spectre#dfe3bc2c59d23cd4bfd43c690aae3655576ff708",
"swagger-ui-dist": "5.7.1",
"swagger-ui-dist": "5.7.2",
"swaggerdark": "github:octycs/SwaggerDark#f02d394c8ff698cdd93e09c2188b058d2d686ca3",
"vue": "3.3.4",
"vue-router": "4.2.4"
Expand All @@ -43,7 +43,7 @@
"npm-run-all": "4.1.5",
"prettier": "3.0.3",
"sass": "1.67.0",
"stylelint-scss": "5.2.0",
"stylelint-scss": "5.2.1",
"typescript": "5.2.2",
"vite": "4.4.9",
"vite-plugin-md": "0.21.5",
Expand Down

0 comments on commit 32bcfde

Please sign in to comment.