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

Merge branch 'main' into 'interface_admin'

# Conflicts:
#   backend/db/crud.py
parents 64d575d1 5ded1cae
Branches
No related tags found
1 merge request!53Interface admin
Pipeline #44460 passed
Showing with 161 additions and 106 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment