]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'feature/emilie-timesheet'
authorEmilie <zawadzki@ircam.fr>
Wed, 28 Dec 2016 11:31:56 +0000 (12:31 +0100)
committerEmilie <zawadzki@ircam.fr>
Wed, 28 Dec 2016 11:31:56 +0000 (12:31 +0100)

Trivial merge