]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0395334 4d3c362)
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)
Conflicts:
app/organization/network/admin.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.