Skip to content
Commit ad9db648 authored by Marco De Donno's avatar Marco De Donno
Browse files

Merge branch 'develop' into feature/LR 

# Conflicts:
#	backend/TE/TakeExercise.php
parents ae3a94e2 1a6240b4
Pipeline #1019 passed with stages
in 22 seconds