Skip to content

Commit

Permalink
Merge branch 'main' into data-update
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderStorm authored Sep 30, 2023
2 parents 16d51df + 7e45461 commit 715e0de
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 36 deletions.
8 changes: 4 additions & 4 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 @@ -44,7 +44,7 @@ futures = "0.3.28"
rustls = "0.21.7"
reqwest = { version = "0.11.20", default-features = false, features = ["rustls", "json"] }
minidom = "0.15.2"
regex = "1.9.5"
regex = "1.9.6"

[dev-dependencies]
pretty_assertions.workspace = true
2 changes: 1 addition & 1 deletion server/feedback/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ serde.workspace = true
serde_json.workspace = true

rand = "0.8.5"
regex = "1.9.5"
regex = "1.9.6"
octocrab = "0.30.1"

# web
Expand Down
2 changes: 1 addition & 1 deletion server/main-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ sqlx = { version = "0.7.2", features = ["sqlite", "runtime-tokio", "migrate", "m
# search
meilisearch-sdk = "0.24.2"
logos="0.13.0"
regex = "1.9.5"
regex = "1.9.6"

# maps
rustls = "0.21.7"
Expand Down
52 changes: 26 additions & 26 deletions webclient/package-lock.json

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

6 changes: 3 additions & 3 deletions webclient/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
"maplibre-gl": "3.3.1",
"pinia": "2.1.6",
"spectre.css": "github:Valexr/spectre#dfe3bc2c59d23cd4bfd43c690aae3655576ff708",
"swagger-ui-dist": "5.7.2",
"swagger-ui-dist": "5.9.0",
"swaggerdark": "github:octycs/SwaggerDark#f02d394c8ff698cdd93e09c2188b058d2d686ca3",
"vue": "3.3.4",
"vue-router": "4.2.5"
},
"devDependencies": {
"@intlify/unplugin-vue-i18n": "1.3.0",
"@intlify/unplugin-vue-i18n": "1.4.0",
"@rushstack/eslint-patch": "1.5.0",
"@sentry/vite-plugin": "2.7.1",
"@types/swagger-ui-dist": "3.30.2",
Expand All @@ -48,7 +48,7 @@
"vite": "4.4.9",
"vite-plugin-md": "0.21.5",
"vite-plugin-rewrite-all": "1.0.1",
"vue-i18n": "9.4.1",
"vue-i18n": "9.5.0",
"vue-tsc": "1.8.15"
},
"type": "module"
Expand Down

0 comments on commit 715e0de

Please sign in to comment.