]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 863fdac 3ce5378)
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)
1  2 
app/local_settings.py patch | diff1 | diff2 | blob | history
app/organization/projects/admin.py patch | diff1 | diff2 | blob | history
app/organization/projects/models.py patch | diff1 | diff2 | blob | history

diff --cc app/local_settings.py
Simple merge
diff --cc app/organization/projects/admin.py
Simple merge
diff --cc app/organization/projects/models.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.