]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c8a0f1 e6b475f)
Merge remote-tracking branch 'gitlab/patch-11' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 22:06:19 +0000 (23:06 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 22:06:19 +0000 (23:06 +0100)
1  2 
app/locale/fr/LC_MESSAGES/django.po patch | diff1 | diff2 | blob | history

diff --cc app/locale/fr/LC_MESSAGES/django.po
Simple merge
Unnamed repository; edit this file 'description' to name the repository.