]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 15 Sep 2016 16:08:22 +0000 (18:08 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 15 Sep 2016 16:08:22 +0000 (18:08 +0200)
commited978b230748734089d0c864b1bb295c35b21311
treecc409a263a931f1b3752bd82b7b87078fb67ad15
parentf10f5b413011361cbab3c13699e69e0f319ed775
parent7ceaf908dc7d0cd2f49ea7337186f3f965705dcb
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

Conflicts:
app/organization/shop/urls.py
app/organization/urls.py
app/organization/shop/urls.py
app/organization/shop/views.py