Skip to content
Snippets Groups Projects
Commit eec6035e authored by Lorenzo Conti's avatar Lorenzo Conti
Browse files

Merge branch 'main' into 'feature/ak-conflict-dependency'

# Conflicts:
#   AKModel/models.py
parents ba533efa bb1179c7
No related branches found
No related tags found
1 merge request!9Implement export of AK conflicts and dependencies
Pipeline #269214 passed