]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72eed27 98d4db5)
Merge branch 'prodev' into pro
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Dec 2017 09:25:13 +0000 (10:25 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Dec 2017 09:25:13 +0000 (10:25 +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.