]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 8 Nov 2016 14:41:22 +0000 (15:41 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 8 Nov 2016 14:41:22 +0000 (15:41 +0100)
commit4ac3d1ed4d0ba757b3510a695950aa92d3ede41c
treee7d7dc899831fbbf3c7f596cd308a4f58a1c5228
parent04c07fddc2b606e408ea10b6c8e56ae0f58a2780
parent4c07c01efc70d12786f82c514268f8a92de8eebc
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

Conflicts:
app/templates/network/person_detail.html
app/templates/network/person_detail.html