]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' into feature/themes
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 23 Feb 2017 15:48:31 +0000 (16:48 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 23 Feb 2017 15:48:31 +0000 (16:48 +0100)
commitc46b581c995bcc9766239b463eeeb3d42a810fdc
treec794b046f70bd3c7c0eb553444cc2da74ddd9399
parent795fb9e2712c4d8fde972322f456bd78e6128dbe
parentdfb8be367165455b005e3a22dee37490b5c76fe6
Merge branch 'dev' into feature/themes
app/themes/base/templates/agenda/event_base.html
app/themes/base/templates/agenda/event_detail.html
app/themes/base/templates/core/inc/related_content.html
app/themes/base/templates/pages/custompage.html
app/themes/base/templates/pages/mutations-creations.html
app/themes/base/templates/pages/page.html
app/themes/base/templates/projects/project_detail.html
app/themes/base/templates/twitter/tweets.html