]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 9 Nov 2016 12:00:27 +0000 (13:00 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 9 Nov 2016 12:00:27 +0000 (13:00 +0100)
commitfb4362427bf45fc82c472aebacbecdef3f67504d
tree727720a3db6d73e5461604df6c943407d7ab6b52
parentca6c47db34384353c64029266f34d70004b9c5b3
parentdea8d69679ca8204a8810ea3ca05667a30b69441
Merge branch 'dev'

Conflicts:
app/settings.py