]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 27 Oct 2016 16:10:27 +0000 (18:10 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 27 Oct 2016 16:10:27 +0000 (18:10 +0200)
1  2 
teleforma/models/core.py

Simple merge