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

Merge branch 'develop' into feature/LR 

# Conflicts:
#	backend/TE/TakeExercise.php
parents fb2635d2 e536e4e0
Pipeline #1343 passed with stages
in 8 seconds