]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Apr 2016 10:42:37 +0000 (12:42 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Apr 2016 10:42:37 +0000 (12:42 +0200)
commit112b2aaed1af10594acbcebca743223448d3cb48
tree3304bc875e77b83e7831bc037bbb418682b3d2e5
parente0f08f0d82531d371864d8769a169ed4a9fd6c3b
parentea2ec0f2c57f9ed4b7b7017fcd4cb5ad50aef9bf
Merge branch 'dev'

Conflicts:
app/festival/static/css/index.css