From: Guillaume Pellerin Date: Tue, 17 Mar 2015 21:45:25 +0000 (+0100) Subject: Merge branch 'dev' into feature/jobs X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=335e8689c716282d032b9ac266b7aff3429049b2;p=timeside.git Merge branch 'dev' into feature/jobs --- 335e8689c716282d032b9ac266b7aff3429049b2