]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 7 Nov 2016 18:14:42 +0000 (19:14 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 7 Nov 2016 18:14:42 +0000 (19:14 +0100)
commit9c7c05bf456866b0cea12a71f310991d10cf2bcd
tree6e93f6c8b37e74b86515fff26ecf4d1453b4c018
parent8cb861bfed3fb9e2360efbfe9b47b8240f2c9b76
parent7a395ee80825d9493b66b0c428350569632ba184
Merge branch 'dev'

Conflicts:
app/settings.py