Commit 3a8b37b2 authored by AndiBraimllari's avatar AndiBraimllari
Browse files

Merge branch 'master' into metrics

# Conflicts:
#	elsa/core/CMakeLists.txt
#	elsa/core/Utilities/Statistics.hpp
#	elsa/core/tests/CMakeLists.txt
parents 61586aff 65e71040
Pipeline #866807 failed with stages
in 14 minutes and 12 seconds