From: Emilie <zawadzki@ircam.fr>
Date: Fri, 23 Dec 2016 10:23:25 +0000 (+0100)
Subject: Merge branch 'feature/emilie-timesheet' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=33970971ab611fff8a2efa4a98c0eb2d661c26eb;p=mezzo.git

Merge branch 'feature/emilie-timesheet' into dev
---

33970971ab611fff8a2efa4a98c0eb2d661c26eb