]> git.parisson.com Git - mezzo.git/commit
Merge branch 'feature/emilie-timesheet' of git+ssh://git.forge.ircam.fr/ircam-www...
authorEmilie <zawadzki@ircam.fr>
Fri, 23 Dec 2016 10:01:53 +0000 (11:01 +0100)
committerEmilie <zawadzki@ircam.fr>
Fri, 23 Dec 2016 10:01:53 +0000 (11:01 +0100)
commit72e360a243df790f76456ce43eb76a356b593b2c
treecf017ff0ec014519c97b172619ef0040c05d00de
parent03953342fc00f3d9c12c1598030527883d3b51a9
parent4d3c362605b1df5d95c32584c2f8ebafbe5ff1c4
Merge branch 'feature/emilie-timesheet' of git+ssh://git.forge.ircam.fr/ircam-www into feature/emilie-timesheet

Conflicts:
app/organization/network/admin.py