]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: effad6e 1cbd856)
Merge branch 'prodev' into pro
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 19 Dec 2017 14:59:46 +0000 (15:59 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 19 Dec 2017 14:59:46 +0000 (15:59 +0100)
1  2 
teleforma/admin.py patch | diff1 | diff2 | blob | history

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