]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into feature/timesheets
authorEmilie Zawadzki <zawadzki@ircam.fr>
Wed, 11 Jan 2017 09:36:04 +0000 (10:36 +0100)
committerEmilie Zawadzki <zawadzki@ircam.fr>
Wed, 11 Jan 2017 09:36:04 +0000 (10:36 +0100)
commit203bba559d49504d894f74662d5e4464cabf2bb9
tree8ec731e819ef870c3f6fe5bf4604edd540a640ee
parent863fdac91fcbf12b838b29e1f7b94b24cc082262
parent3ce537864c90ed47ef7fea630bf7fe1df6ae32ec
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into feature/timesheets
app/local_settings.py
app/organization/projects/admin.py
app/organization/projects/models.py