]> git.parisson.com Git - mezzo.git/commit
projects / mezzo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3703305 406a06c)
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)
commit0a3bc1b59b47736c276e32b6f210db02d79661de
treedf2c1044fabff330609507d7362cc72b9d3dc292tree | snapshot
parent370330514dbe260ebfab35968140ad21b7205fb7commit | diff
parent406a06c1c7961d095aced447384252917b67e908commit | diff
Merge branch 'patch-3' into dev

Conflicts:
app/locale/fr/LC_MESSAGES/django.po
app/locale/fr/LC_MESSAGES/django.po diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.