]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'patch-3' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Feb 2017 14:13:42 +0000 (15:13 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Feb 2017 14:13:42 +0000 (15:13 +0100)
Conflicts:
app/locale/fr/LC_MESSAGES/django.po

1  2 
app/locale/fr/LC_MESSAGES/django.po

Simple merge