]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' into feature/demos
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 14:33:17 +0000 (15:33 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 14:33:17 +0000 (15:33 +0100)
commit597977acefe971ae46a06021285d6ee5d477f71a
tree1e599e0b7cf1098fa5d0e392c967ade6c7b89bda
parent7e2dd203552f9fc962408fe00335915e25cd7e9d
parente23cef9c8b26e57ec45121a7e7b896a297fdfec6
Merge branch 'dev' into feature/demos

Conflicts:
app/local_settings.py
app/local_settings.py
app/organization/projects/admin.py
app/organization/projects/translation.py