Skip to content

Commit

Permalink
Merge branch 'master' into refactor-types
Browse files Browse the repository at this point in the history
# Conflicts:
#	ui/src/components/private-access.vue
#	worker/Dockerfile
  • Loading branch information
albanm committed Nov 26, 2024
2 parents c2c8363 + 87eff0f commit 5240c06
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@data-fair/processings",
"version": "2.5.1",
"version": "2.5.2",
"description": "",
"main": "index.js",
"type": "module",
Expand Down

0 comments on commit 5240c06

Please sign in to comment.