]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 2 Jun 2017 11:24:44 +0000 (13:24 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 2 Jun 2017 11:24:44 +0000 (13:24 +0200)
commit2d3530f30c1973855b24fc4202478b2bbf4a9fa4
treed55968eecffe70a008ab20352fcf0b35904bf855
parent43ce543ead955e034aed430ff80d446b0111d8dd
parentc10c1c3240d80138b617fd7d75bdfba334d1a786
Merge branch 'dev' into crem
app/scripts/app.sh
app/settings.py
docker-compose.yml
lib/TimeSide