Skip to content

Commit

Permalink
Merge branch 'main' into v4
Browse files Browse the repository at this point in the history 
# Conflicts:
#	acacore/__version__.py
#	acacore/database/files_db.py
#	pyproject.toml
  • Loading branch information
@MatteoCampinoti94
MatteoCampinoti94 committed Nov 21, 2024
2 parents 2172527 + f0166c9 commit 4b940ef
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 4b940ef

Please sign in to comment.