]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' into prestashop
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 20 Oct 2016 08:50:37 +0000 (10:50 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 20 Oct 2016 08:50:37 +0000 (10:50 +0200)
commit9b6cbb48ecd37ad57b283364a5a08822932ae6b6
tree233ab691f76820ec1e9e1f338f6a76afed0e25ce
parentcc55ea5c735471e066e37c09b1ada3badc20a6e0
parent7db468f16ff4fea49ca11522152ab686546041e3
Merge branch 'dev' into prestashop

Conflicts:
lib/django-prestashop
app/templates/agenda/includes/event_metainfo.html