]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4299fd5 89f4552)
Merge branch 'tc202-dev' of git.parisson.com:git/teleforma into tc202-dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 5 Feb 2019 00:32:29 +0000 (01:32 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 5 Feb 2019 00:32:29 +0000 (01:32 +0100)
1  2 
app/settings.py patch | diff1 | diff2 | blob | history

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