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

Merge branch 'feature/LR' into feature/ESLR 

# Conflicts:
#	backend/TE/Driver.php
#	js/pianos4_tool_LR.js
parents af1a668d df15255f
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