]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 31 Jul 2018 22:22:40 +0000 (00:22 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 31 Jul 2018 22:22:40 +0000 (00:22 +0200)
commit40b1fe8a05448f11a912f58acb02c65e62d9b748
tree8a7fae9191840f754a90a0dbe712c22007dc9b19
parent431e98672214d8d02f288208ad692c6cfdcab64a
parentdd24a50787efff82ee6bcaeb1e7cd05eaf9f3de3
Merge branch 'dev'
app/settings.py