]> git.parisson.com Git - mezzo.git/commit
[settings] : resolving conflicts
authorEmilie <zawadzki@ircam.fr>
Fri, 22 Dec 2017 11:13:56 +0000 (12:13 +0100)
committerEmilie <zawadzki@ircam.fr>
Fri, 22 Dec 2017 11:13:56 +0000 (12:13 +0100)
commit9f56b73d7ad8ea1ce8e5e24198db398109bec661
tree1d81d0c12f03a0957f59abdcc00eb4164920ca4c
parent1d644f341da320ff9885113ee6f000144299997b
parent2d576dd812720bae05bee5177a0c10e057921a3f
[settings] : resolving conflicts
app/local_settings.py