]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d02d689 027421f)
Merge branch 'dev' into tc202
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 19 Jul 2017 09:56:52 +0000 (11:56 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 19 Jul 2017 09:56:52 +0000 (11:56 +0200)
1  2 
teleforma/models/core.py patch | diff1 | diff2 | blob | history

diff --cc teleforma/models/core.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.