]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc55ea5 7db468f)
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)
Conflicts:
lib/django-prestashop

1  2 
app/templates/agenda/includes/event_metainfo.html patch | diff1 | diff2 | blob | history

Unnamed repository; edit this file 'description' to name the repository.