Skip to content

Commit

Permalink
Merge branch 'master' into v5
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	digiarch/__version__.py
#	digiarch/commands/identify.py
#	poetry.lock
#	pyproject.toml
  • Loading branch information
MatteoCampinoti94 committed Nov 21, 2024
2 parents e0ae5cb + 2d9e145 commit 9399557
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## v5.0.0

## v4.1.12

### Changes

* Use acacore 3.3.3

## v4.1.11

### Changes
Expand Down
Binary file modified tests/files/_metadata/files.db
Binary file not shown.

0 comments on commit 9399557

Please sign in to comment.