]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3daf3f7 f1c8591)
Merge branch 'docker' into tc202-dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 5 Feb 2019 00:59:38 +0000 (01:59 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 5 Feb 2019 00:59:38 +0000 (01: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.