From: Emilie <zawadzki@ircam.fr>
Date: Fri, 23 Dec 2016 10:01:53 +0000 (+0100)
Subject: Merge branch 'feature/emilie-timesheet' of git+ssh://git.forge.ircam.fr/ircam-www... 
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=72e360a243df790f76456ce43eb76a356b593b2c;p=mezzo.git

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

Conflicts:
	app/organization/network/admin.py
---

72e360a243df790f76456ce43eb76a356b593b2c