]> git.parisson.com Git - mezzo.git/commit
Merge branch 'article' into dev
authorEmilie <zawadzki@ircam.fr>
Thu, 7 Jul 2016 09:49:24 +0000 (11:49 +0200)
committerEmilie <zawadzki@ircam.fr>
Thu, 7 Jul 2016 09:49:24 +0000 (11:49 +0200)
commitf1fb0f692bd7b4dbb4038c021ea32a289de9d428
tree8c7ae4983483175bfc0dac7454dbe325d07c4247
parent0284f48fbb49c1e938600d2fb45478e403219c6a
parentc4926316a3a111c5c8a8a29a656560d2dfdce256
Merge branch 'article' into dev

Conflicts:
app/custom/models.py
app/local_settings.py
app/organization/core/admin.py
app/organization/magazine/models.py
app/settings.py
app/local_settings.py
app/organization/core/admin.py
app/organization/core/translation.py
app/organization/magazine/models.py
app/organization/project/admin.py
app/settings.py