]> git.parisson.com Git - mezzo.git/commit
projects / mezzo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8c359ed e47f9d3)
Merge branch 'dev' of gitlab.com:yomguy/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 8 Nov 2016 10:28:36 +0000 (11:28 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 8 Nov 2016 10:28:36 +0000 (11:28 +0100)
commit0dcb335c4114c5c45822fd389363cb145923be82
treebbce5538db0da96b34954cb9fea05f6d310b302ftree | snapshot
parent8c359ed2bb97abf37a8b6d51f5340091efe7934dcommit | diff
parente47f9d345ed558a84eb6506b6a076c55ce8d450ccommit | diff
Merge branch 'dev' of gitlab.com:yomguy/ircam-www 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.