]> git.parisson.com Git - mezzo.git/commitdiff
resolving conflicts
authorEmilie <zawadzki@ircam.fr>
Wed, 15 Feb 2017 11:49:51 +0000 (12:49 +0100)
committerEmilie <zawadzki@ircam.fr>
Wed, 15 Feb 2017 11:49:51 +0000 (12:49 +0100)
1  2 
app/templates/home/inc/body.html

Simple merge