]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa289d0 312c5db)
Merge branch 'master' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 13 Nov 2017 14:30:58 +0000 (15:30 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 13 Nov 2017 14:30:58 +0000 (15:30 +0100)
1  2 
teleforma/views/core.py patch | diff1 | diff2 | blob | history

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