]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 578cb57 b3e932c)
Merge branch 'dev' into feature/haystack
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 20 Jan 2016 20:33:09 +0000 (21:33 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 20 Jan 2016 20:33:09 +0000 (21:33 +0100)
1  2 
app/sandbox/settings.py patch | diff1 | diff2 | blob | history

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