]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' into feature/webclass
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 19 Jul 2017 12:02:31 +0000 (14:02 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 19 Jul 2017 12:02:31 +0000 (14:02 +0200)
1  2 
teleforma/models/core.py

Simple merge