]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into feature/timesheets
authorEmilie <zawadzki@ircam.fr>
Wed, 28 Dec 2016 13:51:10 +0000 (14:51 +0100)
committerEmilie <zawadzki@ircam.fr>
Wed, 28 Dec 2016 13:51:10 +0000 (14:51 +0100)
commit9713bd12f47549293e8100ef3580dbe1af4e4ddd
treea737947f2f0e23df781597e2e14e0036548147e4
parentf7361c1551e12ba5d48cdc24139a451a80272c42
parentd64d51ed7f5fc7925b630f8b0e22a07248ae7d55
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into feature/timesheets

Conflicts:
app/organization/network/models.py
app/organization/network/models.py
app/organization/projects/models.py