From: Emilie Zawadzki <zawadzki@ircam.fr>
Date: Wed, 11 Jan 2017 09:36:04 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into feature/timesheets
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=203bba559d49504d894f74662d5e4464cabf2bb9;p=mezzo.git

Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into feature/timesheets
---

203bba559d49504d894f74662d5e4464cabf2bb9