Skip to content
Snippets Groups Projects
Commit 385a3c78 authored by Antoine Gaudron-Desjardins's avatar Antoine Gaudron-Desjardins
Browse files

Merge branch 'main' into 'update_ci'

# Conflicts:
#   backend/video_capture.py
parents 67eee02b 158ff411
Branches
No related tags found
1 merge request!54fix artifacts vs cache
Pipeline #44502 passed
Showing
with 406 additions and 73 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment