Skip to content

Commit

Permalink
Merge branch 'master' into mainline-3-1-crosslinks
Browse files Browse the repository at this point in the history
  • Loading branch information
ns-rse authored Feb 14, 2024
2 parents 3640054 + 2904aa1 commit 3a5ae41
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion lib/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ tests = [
"pytest>=7.0",
"pytest-cov",
"pytest-mpl",
"pytest-regtest<2.0.0",
"pytest-regtest",
"pytest-xdist"
]
docs = [
Expand Down
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"tailwindcss": "3.3.3",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^4.4.2",
"vite": "^4.4.12",
"vite-plugin-tailwind-purgecss": "0.1.3"
},
"type": "module",
Expand Down
42 changes: 21 additions & 21 deletions web/pnpm-lock.yaml

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

0 comments on commit 3a5ae41

Please sign in to comment.