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
6 merge requests!262[WIP] compatibility with koma solver import/export,!261[WIP] compatibility with koma solver import/export,!260[WIP] import/export merge,!259Add view to clear schedule,!237Draft: add tests on json export,!235Merge fork for interoperability of KoMa solver
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment