]> git.parisson.com Git - mezzo.git/commitdiff
Brief : merging
authorEmilie <zawadzki@ircam.fr>
Thu, 7 Jul 2016 15:00:45 +0000 (17:00 +0200)
committerEmilie <zawadzki@ircam.fr>
Thu, 7 Jul 2016 15:00:45 +0000 (17:00 +0200)
1  2 
app/local_settings.py
app/organization/magazine/models.py
app/settings.py

Simple merge
Simple merge
diff --cc app/settings.py
Simple merge