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

Merge branch 'feature/TPS' into develop 

# Conflicts:
#	backend/TE/TakeExercise.php
#	js/pianos4_view.js
parents 7d628084 1a8b8d39
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment