]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorJérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Mon, 10 Oct 2016 08:05:42 +0000 (10:05 +0200)
committerJérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Mon, 10 Oct 2016 08:05:42 +0000 (10:05 +0200)
commit148c68eace33d08a036932656bfc3a6caf9e1dc3
tree7dcefb76905e606e95d09420007f6b7c0db9fc18
parent0d705a8f5a661f9f3658728291a0cba96477d8b8
parent0e7501a09c4a1991cfea58818a1ba8f8ef07be9d
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

# Conflicts:
# app/templates/shop/includes/product_list_square_style.html
app/templates/pages/custompage.html
app/templates/shop/includes/product_list_square_style.html