]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 7 Nov 2016 15:40:35 +0000 (16:40 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 7 Nov 2016 15:40:35 +0000 (16:40 +0100)
commit8cb861bfed3fb9e2360efbfe9b47b8240f2c9b76
tree4c53c214c84ad2bbdd8b7f435b4650b822974eee
parentc1717e5d74135585dcac4418a13f0248f560d32a
parent019d6068b21388e9f8e0c3d95d85724bb68c85ef
Merge branch 'dev'

Conflicts:
app/settings.py
app/settings.py