js/pianos4_annotation.js · 7b5f7dfabf6aad56b0b0969304e45a4d7673a698 · PiAnoS / PiAnoS · GitLab

Sep 11, 2017
d7ec558a
Merge branch 'feature/TPS' into develop · d7ec558a
Marco De Donno authored Sep 11, 2017
```
# Conflicts:
#	backend/TE/TakeExercise.php
#	js/pianos4_view.js
```
d7ec558a
Merge branch 'feature/TPS' into develop
Marco De Donno authored Sep 11, 2017
```
# Conflicts:
#	backend/TE/TakeExercise.php
#	js/pianos4_view.js
```