Skip to content
Snippets Groups Projects
Commit bea7d5bc authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge branch 'master' into 'devel' 

# Conflicts:
#   CMakeLists.txt
#   demos/hello_wolf/yaml/hello_wolf_config.yaml
#   include/core/problem/problem.h
#   test/yaml/solver.yaml
parents 092a95f0 92d070d2
No related branches found
No related tags found
1 merge request!436Release to start wolf public
Pipeline #8568 failed