]> git.parisson.com Git - mezzo.git/commit
Merge branch 'feature/demos' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 17:47:38 +0000 (18:47 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 17:47:38 +0000 (18:47 +0100)
commit203a965f8a2f66c0bb948244ecb73d0c96c5ffd6
tree83822b4b481d6c905eca69a671b4a3bf7cf7bef0
parent2a3ccf7e306bbbfd5964b2c23f7c7516918e8976
parent7f588070ca2221457adc0c7fe6a076aac191002e
Merge branch 'feature/demos' into dev
app/local_settings.py